|
19 | 19 | import com.google.api.core.ApiFunction; |
20 | 20 | import com.google.api.gax.core.ExecutorProvider; |
21 | 21 | import com.google.api.gax.grpc.GrpcInterceptorProvider; |
22 | | -import com.google.api.gax.longrunning.OperationSnapshot; |
23 | 22 | import com.google.api.gax.longrunning.OperationTimedPollAlgorithm; |
24 | 23 | import com.google.api.gax.retrying.RetrySettings; |
25 | | -import com.google.api.gax.rpc.StatusCode; |
26 | 24 | import com.google.api.gax.rpc.TransportChannelProvider; |
27 | | -import com.google.api.gax.rpc.UnaryCallSettings; |
28 | 25 | import com.google.cloud.NoCredentials; |
29 | 26 | import com.google.cloud.ServiceDefaults; |
30 | 27 | import com.google.cloud.ServiceOptions; |
|
47 | 44 | import com.google.common.collect.ImmutableMap; |
48 | 45 | import com.google.common.collect.ImmutableSet; |
49 | 46 | 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; |
53 | 47 | import com.google.spanner.v1.ExecuteSqlRequest.QueryOptions; |
54 | 48 | import io.grpc.CallCredentials; |
55 | 49 | import io.grpc.CompressorRegistry; |
@@ -331,47 +325,15 @@ private Builder() { |
331 | 325 | .setRpcTimeoutMultiplier(1.5) |
332 | 326 | .setTotalTimeout(Duration.ofHours(48L)) |
333 | 327 | .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(); |
344 | 328 | databaseAdminStubSettingsBuilder |
345 | 329 | .createDatabaseOperationSettings() |
346 | | - .setPollingAlgorithm(longRunningPollingAlgorithm) |
347 | | - .setInitialCallSettings( |
348 | | - UnaryCallSettings |
349 | | - .<CreateDatabaseRequest, OperationSnapshot>newUnaryCallSettingsBuilder() |
350 | | - .setRetrySettings(longRunningRetrySettings) |
351 | | - .build()); |
| 330 | + .setPollingAlgorithm(longRunningPollingAlgorithm); |
352 | 331 | databaseAdminStubSettingsBuilder |
353 | 332 | .createBackupOperationSettings() |
354 | | - .setPollingAlgorithm(longRunningPollingAlgorithm) |
355 | | - .setInitialCallSettings( |
356 | | - UnaryCallSettings |
357 | | - .<CreateBackupRequest, OperationSnapshot>newUnaryCallSettingsBuilder() |
358 | | - .setRetrySettings(longRunningRetrySettings) |
359 | | - .build()); |
| 333 | + .setPollingAlgorithm(longRunningPollingAlgorithm); |
360 | 334 | databaseAdminStubSettingsBuilder |
361 | 335 | .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); |
375 | 337 | } |
376 | 338 |
|
377 | 339 | Builder(SpannerOptions options) { |
|
0 commit comments