@@ -63,6 +63,27 @@ public class BigtableTableAdminClientV2 extends BaseBigtableTableAdminClient {
6363 optimizeRestoredTableOperationBaseCallable ;
6464 private final java .util .concurrent .ScheduledExecutorService backgroundExecutor ;
6565
66+ private static final RetrySettings AWAIT_CONSISTENCY_POLLING_SETTINGS_BASE =
67+ RetrySettings .newBuilder ()
68+ .setInitialRetryDelayDuration (Duration .ofSeconds (10 ))
69+ .setRetryDelayMultiplier (1.0 )
70+ .setMaxRetryDelayDuration (Duration .ofSeconds (10 ))
71+ .setInitialRpcTimeoutDuration (Duration .ZERO )
72+ .setMaxRpcTimeoutDuration (Duration .ZERO )
73+ .setRpcTimeoutMultiplier (1.0 )
74+ .build ();
75+
76+ private static final RetrySettings OPTIMIZE_RESTORED_TABLE_POLLING_SETTINGS =
77+ RetrySettings .newBuilder ()
78+ .setInitialRetryDelayDuration (Duration .ofMillis (500L ))
79+ .setRetryDelayMultiplier (1.5 )
80+ .setMaxRetryDelayDuration (Duration .ofMillis (5000L ))
81+ .setInitialRpcTimeoutDuration (Duration .ZERO )
82+ .setRpcTimeoutMultiplier (1.0 )
83+ .setMaxRpcTimeoutDuration (Duration .ZERO )
84+ .setTotalTimeoutDuration (Duration .ofMillis (600000L ))
85+ .build ();
86+
6687 protected BigtableTableAdminClientV2 (BaseBigtableTableAdminSettings settings ) throws IOException {
6788 super (settings );
6889 // Extract the executor directly without spinning up a full channel
@@ -106,15 +127,9 @@ private AwaitConsistencyCallable createAwaitConsistencyCallable(
106127 throws IOException {
107128 // TODO(igorbernstein2): expose polling settings
108129 RetrySettings pollingSettings =
109- RetrySettings . newBuilder ()
130+ AWAIT_CONSISTENCY_POLLING_SETTINGS_BASE . toBuilder ()
110131 .setTotalTimeout (
111132 settings .checkConsistencySettings ().getRetrySettings ().getTotalTimeout ())
112- .setInitialRetryDelayDuration (Duration .ofSeconds (10 ))
113- .setRetryDelayMultiplier (1.0 )
114- .setMaxRetryDelayDuration (Duration .ofSeconds (10 ))
115- .setInitialRpcTimeoutDuration (Duration .ZERO )
116- .setMaxRpcTimeoutDuration (Duration .ZERO )
117- .setRpcTimeoutMultiplier (1.0 )
118133 .build ();
119134
120135 return AwaitConsistencyCallable .create (
@@ -188,16 +203,7 @@ public Empty apply(OperationSnapshot input) {
188203 }
189204 })
190205 .setPollingAlgorithm (
191- OperationTimedPollAlgorithm .create (
192- RetrySettings .newBuilder ()
193- .setInitialRetryDelayDuration (Duration .ofMillis (500L ))
194- .setRetryDelayMultiplier (1.5 )
195- .setMaxRetryDelayDuration (Duration .ofMillis (5000L ))
196- .setInitialRpcTimeoutDuration (Duration .ZERO )
197- .setRpcTimeoutMultiplier (1.0 )
198- .setMaxRpcTimeoutDuration (Duration .ZERO )
199- .setTotalTimeoutDuration (Duration .ofMillis (600000L ))
200- .build ()))
206+ OperationTimedPollAlgorithm .create (OPTIMIZE_RESTORED_TABLE_POLLING_SETTINGS ))
201207 .build ();
202208
203209 return GrpcCallableFactory .createOperationCallable (
0 commit comments