From dbc0efd5dc145576a51b654fa7d24f8953004b81 Mon Sep 17 00:00:00 2001 From: Hengfeng Li Date: Wed, 22 Jul 2020 11:47:26 +1000 Subject: [PATCH 1/2] fix: remove custom timeout and retry settings --- .../google/cloud/spanner/SpannerOptions.java | 38 ++----------------- 1 file changed, 3 insertions(+), 35 deletions(-) diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java index 35a288530f..c506228bd2 100644 --- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java +++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java @@ -331,47 +331,15 @@ private Builder() { .setRpcTimeoutMultiplier(1.5) .setTotalTimeout(Duration.ofHours(48L)) .build()); - RetrySettings longRunningRetrySettings = - RetrySettings.newBuilder() - .setInitialRpcTimeout(Duration.ofSeconds(60L)) - .setMaxRpcTimeout(Duration.ofSeconds(600L)) - .setInitialRetryDelay(Duration.ofSeconds(20L)) - .setMaxRetryDelay(Duration.ofSeconds(45L)) - .setRetryDelayMultiplier(1.5) - .setRpcTimeoutMultiplier(1.5) - .setTotalTimeout(Duration.ofHours(48L)) - .build(); databaseAdminStubSettingsBuilder .createDatabaseOperationSettings() - .setPollingAlgorithm(longRunningPollingAlgorithm) - .setInitialCallSettings( - UnaryCallSettings - .newUnaryCallSettingsBuilder() - .setRetrySettings(longRunningRetrySettings) - .build()); + .setPollingAlgorithm(longRunningPollingAlgorithm); databaseAdminStubSettingsBuilder .createBackupOperationSettings() - .setPollingAlgorithm(longRunningPollingAlgorithm) - .setInitialCallSettings( - UnaryCallSettings - .newUnaryCallSettingsBuilder() - .setRetrySettings(longRunningRetrySettings) - .build()); + .setPollingAlgorithm(longRunningPollingAlgorithm); databaseAdminStubSettingsBuilder .restoreDatabaseOperationSettings() - .setPollingAlgorithm(longRunningPollingAlgorithm) - .setInitialCallSettings( - UnaryCallSettings - .newUnaryCallSettingsBuilder() - .setRetrySettings(longRunningRetrySettings) - .build()); - databaseAdminStubSettingsBuilder - .deleteBackupSettings() - .setRetrySettings(longRunningRetrySettings); - databaseAdminStubSettingsBuilder - .updateBackupSettings() - .setRetrySettings(longRunningRetrySettings) - .setRetryableCodes(StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE); + .setPollingAlgorithm(longRunningPollingAlgorithm); } Builder(SpannerOptions options) { From 8b04497dc5952457ef638ff9e32316f6eadab6d9 Mon Sep 17 00:00:00 2001 From: Hengfeng Li Date: Wed, 22 Jul 2020 15:25:24 +1000 Subject: [PATCH 2/2] Remove unused imports. --- .../main/java/com/google/cloud/spanner/SpannerOptions.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java index c506228bd2..bc3f513ce0 100644 --- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java +++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java @@ -19,12 +19,9 @@ import com.google.api.core.ApiFunction; import com.google.api.gax.core.ExecutorProvider; import com.google.api.gax.grpc.GrpcInterceptorProvider; -import com.google.api.gax.longrunning.OperationSnapshot; import com.google.api.gax.longrunning.OperationTimedPollAlgorithm; import com.google.api.gax.retrying.RetrySettings; -import com.google.api.gax.rpc.StatusCode; import com.google.api.gax.rpc.TransportChannelProvider; -import com.google.api.gax.rpc.UnaryCallSettings; import com.google.cloud.NoCredentials; import com.google.cloud.ServiceDefaults; import com.google.cloud.ServiceOptions; @@ -47,9 +44,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import com.google.spanner.admin.database.v1.CreateBackupRequest; -import com.google.spanner.admin.database.v1.CreateDatabaseRequest; -import com.google.spanner.admin.database.v1.RestoreDatabaseRequest; import com.google.spanner.v1.ExecuteSqlRequest.QueryOptions; import io.grpc.CallCredentials; import io.grpc.CompressorRegistry;