Skip to content

Spanner: Fix retry test cases for database and instance admin operations #6065

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
kolea2 merged 1 commit into from
Aug 12, 2019
Merged

Spanner: Fix retry test cases for database and instance admin operations #6065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
76 changes: 55 additions & 21 deletions ...nts/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseAdminGaxTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

package com.google.cloud.spanner;

import static org.junit.Assert.fail;

import com.google.api.core.ApiFunction;
import com.google.api.gax.grpc.testing.LocalChannelProvider;
import com.google.api.gax.longrunning.OperationFuture;
Expand Down Expand Up @@ -243,28 +245,43 @@ public Void apply(Builder<?, ?> input) {
return null;
}
});
builder

if (!builder
.getDatabaseAdminStubSettingsBuilder()
.createDatabaseOperationSettings()
.setInitialCallSettings(
builder
.getDatabaseAdminStubSettingsBuilder()
.createDatabaseOperationSettings()
.getInitialCallSettings()
.toBuilder()
.setRetrySettings(retrySettings)
.build());
builder
.getInitialCallSettings()
.getRetryableCodes()
.isEmpty()) {
builder
.getDatabaseAdminStubSettingsBuilder()
.createDatabaseOperationSettings()
.setInitialCallSettings(
builder
.getDatabaseAdminStubSettingsBuilder()
.createDatabaseOperationSettings()
.getInitialCallSettings()
.toBuilder()
.setRetrySettings(retrySettings)
.build());
}
if (!builder
.getDatabaseAdminStubSettingsBuilder()
.updateDatabaseDdlOperationSettings()
.setInitialCallSettings(
builder
.getDatabaseAdminStubSettingsBuilder()
.updateDatabaseDdlOperationSettings()
.getInitialCallSettings()
.toBuilder()
.setRetrySettings(retrySettings)
.build());
.getInitialCallSettings()
.getRetryableCodes()
.isEmpty()) {
builder
.getDatabaseAdminStubSettingsBuilder()
.updateDatabaseDdlOperationSettings()
.setInitialCallSettings(
builder
.getDatabaseAdminStubSettingsBuilder()
.updateDatabaseDdlOperationSettings()
.getInitialCallSettings()
.toBuilder()
.setRetrySettings(retrySettings)
.build());
}
spanner = builder.build().getService();
client = spanner.getDatabaseAdminClient();
}
Expand Down Expand Up @@ -369,19 +386,36 @@ public void createDatabaseTest() throws Exception {
}
mockDatabaseAdmin.addResponse(resultOperation);

boolean methodIsIdempotent =
!spanner
.getOptions()
.getDatabaseAdminStubSettings()
.createDatabaseOperationSettings()
.getInitialCallSettings()
.getRetryableCodes()
.isEmpty();
for (int i = 0; i < 2; i++) {
OperationFuture<Database, CreateDatabaseMetadata> actualResponse =
client.createDatabase(INSTANCE, "DATABASE", Arrays.<String>asList());
try {
Database returnedInstance = actualResponse.get();
if (!methodIsIdempotent && i == exceptionAtCall) {
fail("missing expected exception");
}
Assert.assertEquals(name.toString(), returnedInstance.getId().getName());
} catch (ExecutionException e) {
Throwables.throwIfUnchecked(e.getCause());
throw e;
if (!exceptionType.isRetryable() || methodIsIdempotent || i != exceptionAtCall) {
Throwables.throwIfUnchecked(e.getCause());
throw e;
}
}
}
List<AbstractMessage> actualRequests = mockDatabaseAdmin.getRequests();
Assert.assertEquals(2, actualRequests.size());
if (methodIsIdempotent) {
Assert.assertEquals(2, actualRequests.size());
} else {
Assert.assertEquals(1, actualRequests.size());
}
}

@Test
Expand Down
99 changes: 74 additions & 25 deletions ...nts/google-cloud-spanner/src/test/java/com/google/cloud/spanner/InstanceAdminGaxTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

package com.google.cloud.spanner;

import static org.junit.Assert.fail;

import com.google.api.core.ApiFunction;
import com.google.api.gax.grpc.testing.LocalChannelProvider;
import com.google.api.gax.longrunning.OperationFuture;
Expand Down Expand Up @@ -246,28 +248,42 @@ public Void apply(Builder<?, ?> input) {
return null;
}
});
builder
if (!builder
.getInstanceAdminStubSettingsBuilder()
.createInstanceOperationSettings()
.setInitialCallSettings(
builder
.getInstanceAdminStubSettingsBuilder()
.createInstanceOperationSettings()
.getInitialCallSettings()
.toBuilder()
.setRetrySettings(retrySettings)
.build());
builder
.getInitialCallSettings()
.getRetryableCodes()
.isEmpty()) {
builder
.getInstanceAdminStubSettingsBuilder()
.createInstanceOperationSettings()
.setInitialCallSettings(
builder
.getInstanceAdminStubSettingsBuilder()
.createInstanceOperationSettings()
.getInitialCallSettings()
.toBuilder()
.setRetrySettings(retrySettings)
.build());
}
if (!builder
.getInstanceAdminStubSettingsBuilder()
.updateInstanceOperationSettings()
.setInitialCallSettings(
builder
.getInstanceAdminStubSettingsBuilder()
.updateInstanceOperationSettings()
.getInitialCallSettings()
.toBuilder()
.setRetrySettings(retrySettings)
.build());
.getInitialCallSettings()
.getRetryableCodes()
.isEmpty()) {
builder
.getInstanceAdminStubSettingsBuilder()
.updateInstanceOperationSettings()
.setInitialCallSettings(
builder
.getInstanceAdminStubSettingsBuilder()
.updateInstanceOperationSettings()
.getInitialCallSettings()
.toBuilder()
.setRetrySettings(retrySettings)
.build());
}
spanner = builder.build().getService();
client = spanner.getInstanceAdminClient();
}
Expand Down Expand Up @@ -453,6 +469,14 @@ public void createInstanceTest() throws Exception {
}
mockInstanceAdmin.addResponse(resultOperation);

boolean methodIsIdempotent =
!spanner
.getOptions()
.getInstanceAdminStubSettings()
.createInstanceOperationSettings()
.getInitialCallSettings()
.getRetryableCodes()
.isEmpty();
for (int i = 0; i < 2; i++) {
OperationFuture<Instance, CreateInstanceMetadata> actualResponse =
client.createInstance(
Expand All @@ -462,14 +486,23 @@ public void createInstanceTest() throws Exception {
.build());
try {
Instance returnedInstance = actualResponse.get();
if (!methodIsIdempotent && i == exceptionAtCall) {
fail("missing expected exception");
}
Assert.assertEquals(displayName, returnedInstance.getDisplayName());
} catch (ExecutionException e) {
Throwables.throwIfUnchecked(e.getCause());
throw e;
if (!exceptionType.isRetryable() || methodIsIdempotent || i != exceptionAtCall) {
Throwables.throwIfUnchecked(e.getCause());
throw e;
}
}
}
List<AbstractMessage> actualRequests = mockInstanceAdmin.getRequests();
Assert.assertEquals(2, actualRequests.size());
if (methodIsIdempotent) {
Assert.assertEquals(2, actualRequests.size());
} else {
Assert.assertEquals(1, actualRequests.size());
}
}

@Test
Expand Down Expand Up @@ -501,6 +534,14 @@ public void updateInstanceTest() throws Exception {
}
mockInstanceAdmin.addResponse(resultOperation);

boolean methodIsIdempotent =
!spanner
.getOptions()
.getInstanceAdminStubSettings()
.updateInstanceOperationSettings()
.getInitialCallSettings()
.getRetryableCodes()
.isEmpty();
for (int i = 0; i < 2; i++) {
OperationFuture<Instance, UpdateInstanceMetadata> actualResponse =
client.updateInstance(
Expand All @@ -510,15 +551,23 @@ public void updateInstanceTest() throws Exception {
.build());
try {
Instance returnedInstance = actualResponse.get();
if (!methodIsIdempotent && i == exceptionAtCall) {
fail("missing expected exception");
}
Assert.assertEquals(displayName, returnedInstance.getDisplayName());
} catch (ExecutionException e) {
Throwables.throwIfUnchecked(e.getCause());
throw e;
if (!exceptionType.isRetryable() || methodIsIdempotent || i != exceptionAtCall) {
Throwables.throwIfUnchecked(e.getCause());
throw e;
}
}
}

List<AbstractMessage> actualRequests = mockInstanceAdmin.getRequests();
Assert.assertEquals(2, actualRequests.size());
if (methodIsIdempotent) {
Assert.assertEquals(2, actualRequests.size());
} else {
Assert.assertEquals(1, actualRequests.size());
}
}

@Test
Expand Down