Skip to content

Commit f6afd21

Browse files
authored
fix: remove custom timeout and retry settings (#365)
* fix: remove custom timeout and retry settings
1 parent b264100 commit f6afd21

File tree

1 file changed

+3
-41
lines changed

1 file changed

+3
-41
lines changed

google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java

+3-41
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,9 @@
1919
import com.google.api.core.ApiFunction;
2020
import com.google.api.gax.core.ExecutorProvider;
2121
import com.google.api.gax.grpc.GrpcInterceptorProvider;
22-
import com.google.api.gax.longrunning.OperationSnapshot;
2322
import com.google.api.gax.longrunning.OperationTimedPollAlgorithm;
2423
import com.google.api.gax.retrying.RetrySettings;
25-
import com.google.api.gax.rpc.StatusCode;
2624
import com.google.api.gax.rpc.TransportChannelProvider;
27-
import com.google.api.gax.rpc.UnaryCallSettings;
2825
import com.google.cloud.NoCredentials;
2926
import com.google.cloud.ServiceDefaults;
3027
import com.google.cloud.ServiceOptions;
@@ -47,9 +44,6 @@
4744
import com.google.common.collect.ImmutableMap;
4845
import com.google.common.collect.ImmutableSet;
4946
import com.google.common.util.concurrent.ThreadFactoryBuilder;
50-
import com.google.spanner.admin.database.v1.CreateBackupRequest;
51-
import com.google.spanner.admin.database.v1.CreateDatabaseRequest;
52-
import com.google.spanner.admin.database.v1.RestoreDatabaseRequest;
5347
import com.google.spanner.v1.ExecuteSqlRequest.QueryOptions;
5448
import io.grpc.CallCredentials;
5549
import io.grpc.CompressorRegistry;
@@ -331,47 +325,15 @@ private Builder() {
331325
.setRpcTimeoutMultiplier(1.5)
332326
.setTotalTimeout(Duration.ofHours(48L))
333327
.build());
334-
RetrySettings longRunningRetrySettings =
335-
RetrySettings.newBuilder()
336-
.setInitialRpcTimeout(Duration.ofSeconds(60L))
337-
.setMaxRpcTimeout(Duration.ofSeconds(600L))
338-
.setInitialRetryDelay(Duration.ofSeconds(20L))
339-
.setMaxRetryDelay(Duration.ofSeconds(45L))
340-
.setRetryDelayMultiplier(1.5)
341-
.setRpcTimeoutMultiplier(1.5)
342-
.setTotalTimeout(Duration.ofHours(48L))
343-
.build();
344328
databaseAdminStubSettingsBuilder
345329
.createDatabaseOperationSettings()
346-
.setPollingAlgorithm(longRunningPollingAlgorithm)
347-
.setInitialCallSettings(
348-
UnaryCallSettings
349-
.<CreateDatabaseRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
350-
.setRetrySettings(longRunningRetrySettings)
351-
.build());
330+
.setPollingAlgorithm(longRunningPollingAlgorithm);
352331
databaseAdminStubSettingsBuilder
353332
.createBackupOperationSettings()
354-
.setPollingAlgorithm(longRunningPollingAlgorithm)
355-
.setInitialCallSettings(
356-
UnaryCallSettings
357-
.<CreateBackupRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
358-
.setRetrySettings(longRunningRetrySettings)
359-
.build());
333+
.setPollingAlgorithm(longRunningPollingAlgorithm);
360334
databaseAdminStubSettingsBuilder
361335
.restoreDatabaseOperationSettings()
362-
.setPollingAlgorithm(longRunningPollingAlgorithm)
363-
.setInitialCallSettings(
364-
UnaryCallSettings
365-
.<RestoreDatabaseRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
366-
.setRetrySettings(longRunningRetrySettings)
367-
.build());
368-
databaseAdminStubSettingsBuilder
369-
.deleteBackupSettings()
370-
.setRetrySettings(longRunningRetrySettings);
371-
databaseAdminStubSettingsBuilder
372-
.updateBackupSettings()
373-
.setRetrySettings(longRunningRetrySettings)
374-
.setRetryableCodes(StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE);
336+
.setPollingAlgorithm(longRunningPollingAlgorithm);
375337
}
376338

377339
Builder(SpannerOptions options) {

0 commit comments

Comments
 (0)