Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit df1d307

Browse files
authoredFeb 8, 2024
fix: extend timeouts for deleting snapshots, backups and tables (#2108)
- [ ] Regenerate this pull request now. PiperOrigin-RevId: 605388988 Source-Link: https://togithub.com/googleapis/googleapis/commit/fbcfef09510b842774530989889ed1584a8b5acb Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/716b6e6a6a0e8c87a48a86e31272a2826f2df38c Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNzE2YjZlNmE2YTBlOGM4N2E0OGE4NmUzMTI3MmEyODI2ZjJkZjM4YyJ9
1 parent 2804b2c commit df1d307

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed
 

‎google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStubSettings.java

+16-16
Original file line numberDiff line numberDiff line change
@@ -729,10 +729,10 @@ public static class Builder
729729
ImmutableSet.copyOf(
730730
Lists.<StatusCode.Code>newArrayList(
731731
StatusCode.Code.UNAVAILABLE, StatusCode.Code.DEADLINE_EXCEEDED)));
732-
definitions.put(
733-
"no_retry_1_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
734732
definitions.put(
735733
"no_retry_3_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
734+
definitions.put(
735+
"no_retry_1_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
736736
RETRYABLE_CODE_DEFINITIONS = definitions.build();
737737
}
738738

@@ -762,14 +762,6 @@ public static class Builder
762762
.setTotalTimeout(Duration.ofMillis(60000L))
763763
.build();
764764
definitions.put("retry_policy_2_params", settings);
765-
settings =
766-
RetrySettings.newBuilder()
767-
.setInitialRpcTimeout(Duration.ofMillis(60000L))
768-
.setRpcTimeoutMultiplier(1.0)
769-
.setMaxRpcTimeout(Duration.ofMillis(60000L))
770-
.setTotalTimeout(Duration.ofMillis(60000L))
771-
.build();
772-
definitions.put("no_retry_1_params", settings);
773765
settings =
774766
RetrySettings.newBuilder()
775767
.setInitialRpcTimeout(Duration.ofMillis(3600000L))
@@ -778,6 +770,14 @@ public static class Builder
778770
.setTotalTimeout(Duration.ofMillis(3600000L))
779771
.build();
780772
definitions.put("no_retry_3_params", settings);
773+
settings =
774+
RetrySettings.newBuilder()
775+
.setInitialRpcTimeout(Duration.ofMillis(60000L))
776+
.setRpcTimeoutMultiplier(1.0)
777+
.setMaxRpcTimeout(Duration.ofMillis(60000L))
778+
.setTotalTimeout(Duration.ofMillis(60000L))
779+
.build();
780+
definitions.put("no_retry_1_params", settings);
781781
RETRY_PARAM_DEFINITIONS = definitions.build();
782782
}
783783

@@ -957,8 +957,8 @@ private static Builder initDefaults(Builder builder) {
957957

958958
builder
959959
.deleteTableSettings()
960-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
961-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
960+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_0_codes"))
961+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_0_params"));
962962

963963
builder
964964
.undeleteTableSettings()
@@ -1002,8 +1002,8 @@ private static Builder initDefaults(Builder builder) {
10021002

10031003
builder
10041004
.deleteSnapshotSettings()
1005-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
1006-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
1005+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_0_codes"))
1006+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_0_params"));
10071007

10081008
builder
10091009
.createBackupSettings()
@@ -1022,8 +1022,8 @@ private static Builder initDefaults(Builder builder) {
10221022

10231023
builder
10241024
.deleteBackupSettings()
1025-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
1026-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
1025+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_0_codes"))
1026+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_0_params"));
10271027

10281028
builder
10291029
.listBackupsSettings()

0 commit comments

Comments
 (0)
Failed to load comments.