Skip to content

Commit 2804b2c

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore: update retry settings for backup rpcs (#2107)
* chore: update retry settings for backup rpcs PiperOrigin-RevId: 605367937 Source-Link: googleapis/googleapis@63d2a60 Source-Link: https://github.com/googleapis/googleapis-gen/commit/36c1d985f2b077cc97b2bc69f0e2982c3b6e6bf5 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMzZjMWQ5ODVmMmIwNzdjYzk3YjJiYzY5ZjBlMjk4MmMzYjZlNmJmNSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent a6c7c77 commit 2804b2c

File tree

2 files changed

+70
-86
lines changed

2 files changed

+70
-86
lines changed

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

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -628,14 +628,14 @@ public static class Builder
628628
ImmutableMap.Builder<String, ImmutableSet<StatusCode.Code>> definitions =
629629
ImmutableMap.builder();
630630
definitions.put(
631-
"no_retry_5_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
631+
"no_retry_4_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
632632
definitions.put(
633-
"retry_policy_6_codes",
633+
"retry_policy_5_codes",
634634
ImmutableSet.copyOf(
635635
Lists.<StatusCode.Code>newArrayList(
636636
StatusCode.Code.UNAVAILABLE, StatusCode.Code.DEADLINE_EXCEEDED)));
637637
definitions.put(
638-
"no_retry_7_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
638+
"no_retry_6_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
639639
definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
640640
RETRYABLE_CODE_DEFINITIONS = definitions.build();
641641
}
@@ -652,7 +652,7 @@ public static class Builder
652652
.setMaxRpcTimeout(Duration.ofMillis(300000L))
653653
.setTotalTimeout(Duration.ofMillis(300000L))
654654
.build();
655-
definitions.put("no_retry_5_params", settings);
655+
definitions.put("no_retry_4_params", settings);
656656
settings =
657657
RetrySettings.newBuilder()
658658
.setInitialRetryDelay(Duration.ofMillis(1000L))
@@ -663,15 +663,15 @@ public static class Builder
663663
.setMaxRpcTimeout(Duration.ofMillis(60000L))
664664
.setTotalTimeout(Duration.ofMillis(60000L))
665665
.build();
666-
definitions.put("retry_policy_6_params", settings);
666+
definitions.put("retry_policy_5_params", settings);
667667
settings =
668668
RetrySettings.newBuilder()
669669
.setInitialRpcTimeout(Duration.ofMillis(60000L))
670670
.setRpcTimeoutMultiplier(1.0)
671671
.setMaxRpcTimeout(Duration.ofMillis(60000L))
672672
.setTotalTimeout(Duration.ofMillis(60000L))
673673
.build();
674-
definitions.put("no_retry_7_params", settings);
674+
definitions.put("no_retry_6_params", settings);
675675
settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build();
676676
definitions.put("no_retry_params", settings);
677677
RETRY_PARAM_DEFINITIONS = definitions.build();
@@ -811,53 +811,53 @@ private static Builder createDefault() {
811811
private static Builder initDefaults(Builder builder) {
812812
builder
813813
.createInstanceSettings()
814-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_5_codes"))
815-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_5_params"));
814+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_4_codes"))
815+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_4_params"));
816816

817817
builder
818818
.getInstanceSettings()
819-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_6_codes"))
820-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_6_params"));
819+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_5_codes"))
820+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_5_params"));
821821

822822
builder
823823
.listInstancesSettings()
824-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_6_codes"))
825-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_6_params"));
824+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_5_codes"))
825+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_5_params"));
826826

827827
builder
828828
.updateInstanceSettings()
829-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_6_codes"))
830-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_6_params"));
829+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_5_codes"))
830+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_5_params"));
831831

832832
builder
833833
.partialUpdateInstanceSettings()
834-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_6_codes"))
835-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_6_params"));
834+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_5_codes"))
835+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_5_params"));
836836

837837
builder
838838
.deleteInstanceSettings()
839-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_7_codes"))
840-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_7_params"));
839+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_6_codes"))
840+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_6_params"));
841841

842842
builder
843843
.createClusterSettings()
844-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_7_codes"))
845-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_7_params"));
844+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_6_codes"))
845+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_6_params"));
846846

847847
builder
848848
.getClusterSettings()
849-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_6_codes"))
850-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_6_params"));
849+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_5_codes"))
850+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_5_params"));
851851

852852
builder
853853
.listClustersSettings()
854-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_6_codes"))
855-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_6_params"));
854+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_5_codes"))
855+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_5_params"));
856856

857857
builder
858858
.updateClusterSettings()
859-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_6_codes"))
860-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_6_params"));
859+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_5_codes"))
860+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_5_params"));
861861

862862
builder
863863
.partialUpdateClusterSettings()
@@ -866,61 +866,61 @@ private static Builder initDefaults(Builder builder) {
866866

867867
builder
868868
.deleteClusterSettings()
869-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_7_codes"))
870-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_7_params"));
869+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_6_codes"))
870+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_6_params"));
871871

872872
builder
873873
.createAppProfileSettings()
874-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_7_codes"))
875-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_7_params"));
874+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_6_codes"))
875+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_6_params"));
876876

877877
builder
878878
.getAppProfileSettings()
879-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_6_codes"))
880-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_6_params"));
879+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_5_codes"))
880+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_5_params"));
881881

882882
builder
883883
.listAppProfilesSettings()
884-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_6_codes"))
885-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_6_params"));
884+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_5_codes"))
885+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_5_params"));
886886

887887
builder
888888
.updateAppProfileSettings()
889-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_6_codes"))
890-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_6_params"));
889+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_5_codes"))
890+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_5_params"));
891891

892892
builder
893893
.deleteAppProfileSettings()
894-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_7_codes"))
895-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_7_params"));
894+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_6_codes"))
895+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_6_params"));
896896

897897
builder
898898
.getIamPolicySettings()
899-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_6_codes"))
900-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_6_params"));
899+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_5_codes"))
900+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_5_params"));
901901

902902
builder
903903
.setIamPolicySettings()
904-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_7_codes"))
905-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_7_params"));
904+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_6_codes"))
905+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_6_params"));
906906

907907
builder
908908
.testIamPermissionsSettings()
909-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_6_codes"))
910-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_6_params"));
909+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_5_codes"))
910+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_5_params"));
911911

912912
builder
913913
.listHotTabletsSettings()
914-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_6_codes"))
915-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_6_params"));
914+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_5_codes"))
915+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_5_params"));
916916

917917
builder
918918
.createInstanceOperationSettings()
919919
.setInitialCallSettings(
920920
UnaryCallSettings
921921
.<CreateInstanceRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
922-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_5_codes"))
923-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_5_params"))
922+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_4_codes"))
923+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_4_params"))
924924
.build())
925925
.setResponseTransformer(
926926
ProtoOperationTransformers.ResponseTransformer.create(Instance.class))
@@ -943,8 +943,8 @@ private static Builder initDefaults(Builder builder) {
943943
.setInitialCallSettings(
944944
UnaryCallSettings
945945
.<PartialUpdateInstanceRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
946-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_6_codes"))
947-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_6_params"))
946+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_5_codes"))
947+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_5_params"))
948948
.build())
949949
.setResponseTransformer(
950950
ProtoOperationTransformers.ResponseTransformer.create(Instance.class))
@@ -967,8 +967,8 @@ private static Builder initDefaults(Builder builder) {
967967
.setInitialCallSettings(
968968
UnaryCallSettings
969969
.<CreateClusterRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
970-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_7_codes"))
971-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_7_params"))
970+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_6_codes"))
971+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_6_params"))
972972
.build())
973973
.setResponseTransformer(
974974
ProtoOperationTransformers.ResponseTransformer.create(Cluster.class))
@@ -990,8 +990,8 @@ private static Builder initDefaults(Builder builder) {
990990
.updateClusterOperationSettings()
991991
.setInitialCallSettings(
992992
UnaryCallSettings.<Cluster, OperationSnapshot>newUnaryCallSettingsBuilder()
993-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_6_codes"))
994-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_6_params"))
993+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_5_codes"))
994+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_5_params"))
995995
.build())
996996
.setResponseTransformer(
997997
ProtoOperationTransformers.ResponseTransformer.create(Cluster.class))
@@ -1039,8 +1039,8 @@ private static Builder initDefaults(Builder builder) {
10391039
.setInitialCallSettings(
10401040
UnaryCallSettings
10411041
.<UpdateAppProfileRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
1042-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_6_codes"))
1043-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_6_params"))
1042+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_5_codes"))
1043+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_5_params"))
10441044
.build())
10451045
.setResponseTransformer(
10461046
ProtoOperationTransformers.ResponseTransformer.create(AppProfile.class))

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

Lines changed: 14 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -732,12 +732,7 @@ public static class Builder
732732
definitions.put(
733733
"no_retry_1_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
734734
definitions.put(
735-
"no_retry_4_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
736-
definitions.put(
737-
"retry_policy_3_codes",
738-
ImmutableSet.copyOf(
739-
Lists.<StatusCode.Code>newArrayList(
740-
StatusCode.Code.UNAVAILABLE, StatusCode.Code.DEADLINE_EXCEEDED)));
735+
"no_retry_3_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
741736
RETRYABLE_CODE_DEFINITIONS = definitions.build();
742737
}
743738

@@ -782,18 +777,7 @@ public static class Builder
782777
.setMaxRpcTimeout(Duration.ofMillis(3600000L))
783778
.setTotalTimeout(Duration.ofMillis(3600000L))
784779
.build();
785-
definitions.put("no_retry_4_params", settings);
786-
settings =
787-
RetrySettings.newBuilder()
788-
.setInitialRetryDelay(Duration.ofMillis(1000L))
789-
.setRetryDelayMultiplier(2.0)
790-
.setMaxRetryDelay(Duration.ofMillis(60000L))
791-
.setInitialRpcTimeout(Duration.ofMillis(60000L))
792-
.setRpcTimeoutMultiplier(1.0)
793-
.setMaxRpcTimeout(Duration.ofMillis(60000L))
794-
.setTotalTimeout(Duration.ofMillis(60000L))
795-
.build();
796-
definitions.put("retry_policy_3_params", settings);
780+
definitions.put("no_retry_3_params", settings);
797781
RETRY_PARAM_DEFINITIONS = definitions.build();
798782
}
799783

@@ -988,18 +972,18 @@ private static Builder initDefaults(Builder builder) {
988972

989973
builder
990974
.dropRowRangeSettings()
991-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_4_codes"))
992-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_4_params"));
975+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_3_codes"))
976+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_3_params"));
993977

994978
builder
995979
.generateConsistencyTokenSettings()
996-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_3_codes"))
997-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_3_params"));
980+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_2_codes"))
981+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_2_params"));
998982

999983
builder
1000984
.checkConsistencySettings()
1001-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_3_codes"))
1002-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_3_params"));
985+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_2_codes"))
986+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_2_params"));
1003987

1004988
builder
1005989
.snapshotTableSettings()
@@ -1013,8 +997,8 @@ private static Builder initDefaults(Builder builder) {
1013997

1014998
builder
1015999
.listSnapshotsSettings()
1016-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_3_codes"))
1017-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_3_params"));
1000+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_2_codes"))
1001+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_2_params"));
10181002

10191003
builder
10201004
.deleteSnapshotSettings()
@@ -1058,8 +1042,8 @@ private static Builder initDefaults(Builder builder) {
10581042

10591043
builder
10601044
.getIamPolicySettings()
1061-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_3_codes"))
1062-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_3_params"));
1045+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_2_codes"))
1046+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_2_params"));
10631047

10641048
builder
10651049
.setIamPolicySettings()
@@ -1068,8 +1052,8 @@ private static Builder initDefaults(Builder builder) {
10681052

10691053
builder
10701054
.testIamPermissionsSettings()
1071-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_3_codes"))
1072-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_3_params"));
1055+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_2_codes"))
1056+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_2_params"));
10731057

10741058
builder
10751059
.createTableFromSnapshotOperationSettings()

0 commit comments

Comments
 (0)