Skip to content
This repository was archived by the owner on Sep 16, 2023. It is now read-only.

Commit 1bb2dea

Browse files
yoshi-automationyoshi-automation
authored
fix: update retry settings from grpc_service_config (#201)
This PR was generated using Autosynth. 🌈 Synth log will be available here: https://source.cloud.google.com/results/invocations/de99c0b2-2a31-47d7-9319-d5e99cc10bf3/targets - [ ] To automatically regenerate this PR, check this box. PiperOrigin-RevId: 316146015 Source-Link: googleapis/googleapis@e176585 PiperOrigin-RevId: 316145983 Source-Link: googleapis/googleapis@8d07e2a
1 parent 227d80c commit 1bb2dea

File tree

3 files changed

+67
-43
lines changed

3 files changed

+67
-43
lines changed

‎google-cloud-recommender/src/main/java/com/google/cloud/recommender/v1/stub/RecommenderStubSettings.java‎

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -298,11 +298,13 @@ public static class Builder extends StubSettings.Builder<RecommenderStubSettings
298298
ImmutableMap.Builder<String, ImmutableSet<StatusCode.Code>> definitions =
299299
ImmutableMap.builder();
300300
definitions.put(
301-
"idempotent",
301+
"retry_policy_1_codes",
302302
ImmutableSet.copyOf(
303303
Lists.<StatusCode.Code>newArrayList(
304304
StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
305-
definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
305+
definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
306+
definitions.put(
307+
"no_retry_1_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
306308
RETRYABLE_CODE_DEFINITIONS = definitions.build();
307309
}
308310

@@ -316,12 +318,22 @@ public static class Builder extends StubSettings.Builder<RecommenderStubSettings
316318
.setInitialRetryDelay(Duration.ofMillis(100L))
317319
.setRetryDelayMultiplier(1.3)
318320
.setMaxRetryDelay(Duration.ofMillis(60000L))
319-
.setInitialRpcTimeout(Duration.ofMillis(20000L))
321+
.setInitialRpcTimeout(Duration.ofMillis(60000L))
322+
.setRpcTimeoutMultiplier(1.0)
323+
.setMaxRpcTimeout(Duration.ofMillis(60000L))
324+
.setTotalTimeout(Duration.ofMillis(60000L))
325+
.build();
326+
definitions.put("retry_policy_1_params", settings);
327+
settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build();
328+
definitions.put("no_retry_params", settings);
329+
settings =
330+
RetrySettings.newBuilder()
331+
.setInitialRpcTimeout(Duration.ofMillis(60000L))
320332
.setRpcTimeoutMultiplier(1.0)
321-
.setMaxRpcTimeout(Duration.ofMillis(20000L))
322-
.setTotalTimeout(Duration.ofMillis(600000L))
333+
.setMaxRpcTimeout(Duration.ofMillis(60000L))
334+
.setTotalTimeout(Duration.ofMillis(60000L))
323335
.build();
324-
definitions.put("default", settings);
336+
definitions.put("no_retry_1_params", settings);
325337
RETRY_PARAM_DEFINITIONS = definitions.build();
326338
}
327339

@@ -367,28 +379,28 @@ private static Builder initDefaults(Builder builder) {
367379

368380
builder
369381
.listRecommendationsSettings()
370-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
371-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
382+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
383+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
372384

373385
builder
374386
.getRecommendationSettings()
375-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
376-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
387+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
388+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
377389

378390
builder
379391
.markRecommendationClaimedSettings()
380-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
381-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
392+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
393+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
382394

383395
builder
384396
.markRecommendationSucceededSettings()
385-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
386-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
397+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
398+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
387399

388400
builder
389401
.markRecommendationFailedSettings()
390-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
391-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
402+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
403+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
392404

393405
return builder;
394406
}

‎google-cloud-recommender/src/main/java/com/google/cloud/recommender/v1beta1/stub/RecommenderStubSettings.java‎

Lines changed: 34 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -387,11 +387,13 @@ public static class Builder extends StubSettings.Builder<RecommenderStubSettings
387387
ImmutableMap.Builder<String, ImmutableSet<StatusCode.Code>> definitions =
388388
ImmutableMap.builder();
389389
definitions.put(
390-
"idempotent",
390+
"retry_policy_1_codes",
391391
ImmutableSet.copyOf(
392392
Lists.<StatusCode.Code>newArrayList(
393393
StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
394-
definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
394+
definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
395+
definitions.put(
396+
"no_retry_1_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
395397
RETRYABLE_CODE_DEFINITIONS = definitions.build();
396398
}
397399

@@ -405,12 +407,22 @@ public static class Builder extends StubSettings.Builder<RecommenderStubSettings
405407
.setInitialRetryDelay(Duration.ofMillis(100L))
406408
.setRetryDelayMultiplier(1.3)
407409
.setMaxRetryDelay(Duration.ofMillis(60000L))
408-
.setInitialRpcTimeout(Duration.ofMillis(20000L))
410+
.setInitialRpcTimeout(Duration.ofMillis(60000L))
411+
.setRpcTimeoutMultiplier(1.0)
412+
.setMaxRpcTimeout(Duration.ofMillis(60000L))
413+
.setTotalTimeout(Duration.ofMillis(60000L))
414+
.build();
415+
definitions.put("retry_policy_1_params", settings);
416+
settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build();
417+
definitions.put("no_retry_params", settings);
418+
settings =
419+
RetrySettings.newBuilder()
420+
.setInitialRpcTimeout(Duration.ofMillis(60000L))
409421
.setRpcTimeoutMultiplier(1.0)
410-
.setMaxRpcTimeout(Duration.ofMillis(20000L))
411-
.setTotalTimeout(Duration.ofMillis(600000L))
422+
.setMaxRpcTimeout(Duration.ofMillis(60000L))
423+
.setTotalTimeout(Duration.ofMillis(60000L))
412424
.build();
413-
definitions.put("default", settings);
425+
definitions.put("no_retry_1_params", settings);
414426
RETRY_PARAM_DEFINITIONS = definitions.build();
415427
}
416428

@@ -465,43 +477,43 @@ private static Builder initDefaults(Builder builder) {
465477

466478
builder
467479
.listInsightsSettings()
468-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
469-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
480+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
481+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
470482

471483
builder
472484
.getInsightSettings()
473-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
474-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
485+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
486+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
475487

476488
builder
477489
.markInsightAcceptedSettings()
478-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
479-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
490+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
491+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
480492

481493
builder
482494
.listRecommendationsSettings()
483-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
484-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
495+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
496+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
485497

486498
builder
487499
.getRecommendationSettings()
488-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
489-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
500+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
501+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
490502

491503
builder
492504
.markRecommendationClaimedSettings()
493-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
494-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
505+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
506+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
495507

496508
builder
497509
.markRecommendationSucceededSettings()
498-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
499-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
510+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
511+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
500512

501513
builder
502514
.markRecommendationFailedSettings()
503-
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
504-
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
515+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
516+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
505517

506518
return builder;
507519
}

‎synth.metadata‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@
44
"git": {
55
"name": ".",
66
"remote": "https://github.com/googleapis/java-recommender.git",
7-
"sha": "fcd3e71044259fd791611c29d74fbf54ca206f53"
7+
"sha": "227d80c3f6d4ecbc26c1da91b0dfb97bee81f086"
88
}
99
},
1010
{
1111
"git": {
1212
"name": "googleapis",
1313
"remote": "https://github.com/googleapis/googleapis.git",
14-
"sha": "c4e37010d74071851ff24121f522e802231ac86e",
15-
"internalRef": "313460921"
14+
"sha": "e176585e0f1699e5ec0ec6ad7578f642a2d29f45",
15+
"internalRef": "316146015"
1616
}
1717
},
1818
{
1919
"git": {
2020
"name": "googleapis",
2121
"remote": "https://github.com/googleapis/googleapis.git",
22-
"sha": "c4e37010d74071851ff24121f522e802231ac86e",
23-
"internalRef": "313460921"
22+
"sha": "e176585e0f1699e5ec0ec6ad7578f642a2d29f45",
23+
"internalRef": "316146015"
2424
}
2525
},
2626
{

0 commit comments

Comments
 (0)