Skip to content

Fix record test #11763

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChenTanyi merged 11 commits into from
Jun 4, 2020
Merged

Fix record test #11763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
809ac78
fix: network and resource error
ChenTanyi Jun 4, 2020
1edb9dd
fix: cosmos LRO
ChenTanyi Jun 4, 2020
9a52de0
fix: cosmos test
ChenTanyi Jun 4, 2020
7563fdf
fix: sql impl and remove dependency for storage data plane
ChenTanyi Jun 4, 2020
28ac188
fix: storage error
ChenTanyi Jun 4, 2020
5caab7b
fix: app service error (not finished)
ChenTanyi Jun 4, 2020
a838049
feat: update session-records
ChenTanyi Jun 4, 2020
b5bcf9a
feat: remove unused var
ChenTanyi Jun 4, 2020
f85f0eb
Merge branch 'master' into record-test
ChenTanyi Jun 4, 2020
b0ee157
fix: compile error
ChenTanyi Jun 4, 2020
5aa7521
feat: make format location as static
ChenTanyi Jun 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 50 additions & 45 deletions .../mgmt/src/main/java/com/azure/management/cosmosdb/implementation/CosmosDBAccountImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
import com.azure.management.cosmosdb.models.DatabaseAccountGetResultsInner;
import com.azure.management.resources.fluentcore.arm.Region;
import com.azure.management.resources.fluentcore.arm.models.implementation.GroupableResourceImpl;
import com.azure.management.resources.fluentcore.utils.SdkContext;
import reactor.core.publisher.Mono;

import java.time.Duration;
import java.util.ArrayList;
Expand All @@ -35,10 +37,8 @@
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.function.Function;

import com.azure.management.resources.fluentcore.utils.SdkContext;
import reactor.core.publisher.Mono;
import java.util.Set;
import java.util.stream.Collectors;

/** The implementation for CosmosDBAccount. */
class CosmosDBAccountImpl
Expand Down Expand Up @@ -388,8 +388,7 @@ public CosmosDBAccountImpl withoutReadReplication(Region region) {
this.ensureFailoverIsInitialized();
for (int i = 1; i < this.failoverPolicies.size(); i++) {
if (this.failoverPolicies.get(i).locationName() != null) {
String locName = this.failoverPolicies.get(i).locationName().replace(" ", "")
.toLowerCase(Locale.ROOT);
String locName = this.formatLocationName(this.failoverPolicies.get(i).locationName());
if (locName.equals(region.name())) {
this.failoverPolicies.remove(i);
}
Expand Down Expand Up @@ -536,6 +535,10 @@ private void addLocationsForParameters(HasLocations locationParameters, List<Fai
locationParameters.withLocations(locations);
}

private static String formatLocationName(String locationName) {
return locationName.replace(" ", "").toLowerCase(Locale.ROOT);
}

private Mono<CosmosDBAccount> doDatabaseUpdateCreate() {
final CosmosDBAccountImpl self = this;
final List<Integer> data = new ArrayList<Integer>();
Expand Down Expand Up @@ -565,49 +568,51 @@ private Mono<CosmosDBAccount> doDatabaseUpdateCreate() {
locationParameters = new UpdateLocationParameters(updateParametersInner);
}

final HasLocations finalLocationParameters = locationParameters;
Set<String> locations = locationParameters.locations().stream()
.map(location -> formatLocationName(location.locationName()))
.collect(Collectors.toSet());
return request
.flatMap(
new Function<DatabaseAccountGetResultsInner, Mono<? extends CosmosDBAccount>>() {
@Override
public Mono<? extends CosmosDBAccount> apply(DatabaseAccountGetResultsInner databaseAccountInner) {
self.failoverPolicies.clear();
self.hasFailoverPolicyChanges = false;
return manager()
.databaseAccounts()
.getByResourceGroupAsync(resourceGroupName(), name())
.flatMap(
databaseAccount -> {
if (MAX_DELAY_DUE_TO_MISSING_FAILOVERS > data.get(0)
&& (databaseAccount.id() == null
|| databaseAccount.id().length() == 0
|| finalLocationParameters.locations().size()
> databaseAccount.inner().failoverPolicies().size())) {
return Mono.empty();
}

if (isAFinalProvisioningState(databaseAccount.inner().provisioningState())) {
for (Location location : databaseAccount.readableReplications()) {
if (!isAFinalProvisioningState(location.provisioningState())) {
return Mono.empty();
}
databaseAccountInner -> {
self.failoverPolicies.clear();
self.hasFailoverPolicyChanges = false;
return manager()
.databaseAccounts()
.getByResourceGroupAsync(resourceGroupName(), name())
.flatMap(
databaseAccount -> {
if (MAX_DELAY_DUE_TO_MISSING_FAILOVERS > data.get(0)
&& (databaseAccount.id() == null
|| databaseAccount.id().length() == 0
|| locations.size()
!= databaseAccount.inner().failoverPolicies().size())) {
return Mono.empty();
}

if (isAFinalProvisioningState(databaseAccount.inner().provisioningState())) {
for (Location location : databaseAccount.readableReplications()) {
if (!isAFinalProvisioningState(location.provisioningState())) {
return Mono.empty();
}
if (!locations.contains(formatLocationName(location.locationName()))) {
return Mono.empty();
}
} else {
return Mono.empty();
}

self.setInner(databaseAccount.inner());
return Mono.just(databaseAccount);
})
.repeatWhenEmpty(
longFlux ->
longFlux
.flatMap(
index -> {
data.set(0, data.get(0) + 30);
return Mono.delay(SdkContext.getDelayDuration(Duration.ofSeconds(30)));
}));
}
} else {
return Mono.empty();
}

self.setInner(databaseAccount.inner());
return Mono.just(databaseAccount);
})
.repeatWhenEmpty(
longFlux ->
longFlux
.flatMap(
index -> {
data.set(0, data.get(0) + 30);
return Mono.delay(SdkContext.getDelayDuration(Duration.ofSeconds(30)));
}));
});
}

Expand Down
9 changes: 5 additions & 4 deletions sdk/cosmos/mgmt/src/test/java/com/azure/management/cosmosdb/CosmosDBTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@
import com.azure.management.resources.fluentcore.arm.Region;
import com.azure.management.resources.fluentcore.profile.AzureProfile;
import com.azure.management.resources.implementation.ResourceManager;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

import java.io.IOException;
import java.util.Arrays;
import java.util.Map;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

public class CosmosDBTests extends TestBase {

Expand Down Expand Up @@ -201,7 +202,7 @@ public void canCreateCosmosDbCassandraAccount() {
.withDataModelCassandra()
.withEventualConsistency()
.withWriteReplication(Region.US_EAST)
.withReadReplication(Region.US_CENTRAL)
.withReadReplication(Region.US_WEST)
.withIpRangeFilter("")
.withTag("tag1", "value1")
.create();
Expand Down Expand Up @@ -253,7 +254,7 @@ public void canCreateCosmosDbAzureTableAccount() {
.withDataModelAzureTable()
.withEventualConsistency()
.withWriteReplication(Region.US_EAST)
.withReadReplication(Region.US_CENTRAL)
.withReadReplication(Region.US_EAST2)
.withIpRangeFilter("")
.withTag("tag1", "value1")
.create();
Expand Down
Loading