Skip to content

Commit d9cd8bb

Browse files
miraleungmiraleung
authored
[ggj][codegen][lro] fix: update LRO values to new proposed values (#472)
* fix: update LRO values to new proposed values * fix: update tests
1 parent a40285b commit d9cd8bb

File tree

5 files changed

+33
-34
lines changed

5 files changed

+33
-34
lines changed

‎src/main/java/com/google/api/generator/gapic/composer/RetrySettingsComposer.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,11 @@ public class RetrySettingsComposer {
6363
private static final TypeNode STATUS_CODE_CODE_TYPE =
6464
TypeNode.withReference(ConcreteReference.withClazz(StatusCode.Code.class));
6565

66-
// TODO(miraleung): Determine defaults here.
6766
// Default values for LongRunningConfig fields.
68-
private static final long LRO_DEFAULT_INITIAL_POLL_DELAY_MILLIS = 500;
67+
private static final long LRO_DEFAULT_INITIAL_POLL_DELAY_MILLIS = 20000;
6968
private static final double LRO_DEFAULT_POLL_DELAY_MULTIPLIER = 1.5;
70-
private static final long LRO_DEFAULT_MAX_POLL_DELAY_MILLIS = 5000;
71-
private static final long LRO_DEFAULT_TOTAL_POLL_TIMEOUT_MILLS = 300000;
69+
private static final long LRO_DEFAULT_MAX_POLL_DELAY_MILLIS = 45000;
70+
private static final long LRO_DEFAULT_TOTAL_POLL_TIMEOUT_MILLS = 86400000; // 24 hours.
7271
private static final double LRO_DEFAULT_MAX_RPC_TIMEOUT = 1.0;
7372

7473
public static BlockStatement createRetryParamDefinitionsBlock(

‎src/test/java/com/google/api/generator/gapic/composer/RetrySettingsComposerTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -361,10 +361,10 @@ public void lroBuilderExpr() {
361361
+ "WaitResponse.class))"
362362
+ ".setMetadataTransformer(ProtoOperationTransformers.MetadataTransformer.create("
363363
+ "WaitMetadata.class)).setPollingAlgorithm(OperationTimedPollAlgorithm.create("
364-
+ "RetrySettings.newBuilder().setInitialRetryDelay(Duration.ofMillis(500L))"
365-
+ ".setRetryDelayMultiplier(1.5).setMaxRetryDelay(Duration.ofMillis(5000L))"
364+
+ "RetrySettings.newBuilder().setInitialRetryDelay(Duration.ofMillis(20000L))"
365+
+ ".setRetryDelayMultiplier(1.5).setMaxRetryDelay(Duration.ofMillis(45000L))"
366366
+ ".setInitialRpcTimeout(Duration.ZERO).setRpcTimeoutMultiplier(1.0)"
367-
+ ".setMaxRpcTimeout(Duration.ZERO).setTotalTimeout(Duration.ofMillis(300000L))"
367+
+ ".setMaxRpcTimeout(Duration.ZERO).setTotalTimeout(Duration.ofMillis(86400000L))"
368368
+ ".build()))");
369369
assertEquals(expected, writerVisitor.write());
370370
}

‎src/test/java/com/google/api/generator/gapic/composer/goldens/EchoStubSettings.golden‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -415,13 +415,13 @@ public class EchoStubSettings extends StubSettings<EchoStubSettings> {
415415
.setPollingAlgorithm(
416416
OperationTimedPollAlgorithm.create(
417417
RetrySettings.newBuilder()
418-
.setInitialRetryDelay(Duration.ofMillis(500L))
418+
.setInitialRetryDelay(Duration.ofMillis(20000L))
419419
.setRetryDelayMultiplier(1.5)
420-
.setMaxRetryDelay(Duration.ofMillis(5000L))
420+
.setMaxRetryDelay(Duration.ofMillis(45000L))
421421
.setInitialRpcTimeout(Duration.ZERO)
422422
.setRpcTimeoutMultiplier(1.0)
423423
.setMaxRpcTimeout(Duration.ZERO)
424-
.setTotalTimeout(Duration.ofMillis(300000L))
424+
.setTotalTimeout(Duration.ofMillis(86400000L))
425425
.build()));
426426

427427
return builder;

‎test/integration/goldens/asset/AssetServiceStubSettings.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -601,13 +601,13 @@ private static Builder initDefaults(Builder builder) {
601601
.setPollingAlgorithm(
602602
OperationTimedPollAlgorithm.create(
603603
RetrySettings.newBuilder()
604-
.setInitialRetryDelay(Duration.ofMillis(500L))
604+
.setInitialRetryDelay(Duration.ofMillis(20000L))
605605
.setRetryDelayMultiplier(1.5)
606-
.setMaxRetryDelay(Duration.ofMillis(5000L))
606+
.setMaxRetryDelay(Duration.ofMillis(45000L))
607607
.setInitialRpcTimeout(Duration.ZERO)
608608
.setRpcTimeoutMultiplier(1.0)
609609
.setMaxRpcTimeout(Duration.ZERO)
610-
.setTotalTimeout(Duration.ofMillis(300000L))
610+
.setTotalTimeout(Duration.ofMillis(86400000L))
611611
.build()));
612612

613613
return builder;

‎test/integration/goldens/redis/CloudRedisStubSettings.java‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -552,13 +552,13 @@ private static Builder initDefaults(Builder builder) {
552552
.setPollingAlgorithm(
553553
OperationTimedPollAlgorithm.create(
554554
RetrySettings.newBuilder()
555-
.setInitialRetryDelay(Duration.ofMillis(500L))
555+
.setInitialRetryDelay(Duration.ofMillis(20000L))
556556
.setRetryDelayMultiplier(1.5)
557-
.setMaxRetryDelay(Duration.ofMillis(5000L))
557+
.setMaxRetryDelay(Duration.ofMillis(45000L))
558558
.setInitialRpcTimeout(Duration.ZERO)
559559
.setRpcTimeoutMultiplier(1.0)
560560
.setMaxRpcTimeout(Duration.ZERO)
561-
.setTotalTimeout(Duration.ofMillis(300000L))
561+
.setTotalTimeout(Duration.ofMillis(86400000L))
562562
.build()));
563563

564564
builder
@@ -576,13 +576,13 @@ private static Builder initDefaults(Builder builder) {
576576
.setPollingAlgorithm(
577577
OperationTimedPollAlgorithm.create(
578578
RetrySettings.newBuilder()
579-
.setInitialRetryDelay(Duration.ofMillis(500L))
579+
.setInitialRetryDelay(Duration.ofMillis(20000L))
580580
.setRetryDelayMultiplier(1.5)
581-
.setMaxRetryDelay(Duration.ofMillis(5000L))
581+
.setMaxRetryDelay(Duration.ofMillis(45000L))
582582
.setInitialRpcTimeout(Duration.ZERO)
583583
.setRpcTimeoutMultiplier(1.0)
584584
.setMaxRpcTimeout(Duration.ZERO)
585-
.setTotalTimeout(Duration.ofMillis(300000L))
585+
.setTotalTimeout(Duration.ofMillis(86400000L))
586586
.build()));
587587

588588
builder
@@ -600,13 +600,13 @@ private static Builder initDefaults(Builder builder) {
600600
.setPollingAlgorithm(
601601
OperationTimedPollAlgorithm.create(
602602
RetrySettings.newBuilder()
603-
.setInitialRetryDelay(Duration.ofMillis(500L))
603+
.setInitialRetryDelay(Duration.ofMillis(20000L))
604604
.setRetryDelayMultiplier(1.5)
605-
.setMaxRetryDelay(Duration.ofMillis(5000L))
605+
.setMaxRetryDelay(Duration.ofMillis(45000L))
606606
.setInitialRpcTimeout(Duration.ZERO)
607607
.setRpcTimeoutMultiplier(1.0)
608608
.setMaxRpcTimeout(Duration.ZERO)
609-
.setTotalTimeout(Duration.ofMillis(300000L))
609+
.setTotalTimeout(Duration.ofMillis(86400000L))
610610
.build()));
611611

612612
builder
@@ -624,13 +624,13 @@ private static Builder initDefaults(Builder builder) {
624624
.setPollingAlgorithm(
625625
OperationTimedPollAlgorithm.create(
626626
RetrySettings.newBuilder()
627-
.setInitialRetryDelay(Duration.ofMillis(500L))
627+
.setInitialRetryDelay(Duration.ofMillis(20000L))
628628
.setRetryDelayMultiplier(1.5)
629-
.setMaxRetryDelay(Duration.ofMillis(5000L))
629+
.setMaxRetryDelay(Duration.ofMillis(45000L))
630630
.setInitialRpcTimeout(Duration.ZERO)
631631
.setRpcTimeoutMultiplier(1.0)
632632
.setMaxRpcTimeout(Duration.ZERO)
633-
.setTotalTimeout(Duration.ofMillis(300000L))
633+
.setTotalTimeout(Duration.ofMillis(86400000L))
634634
.build()));
635635

636636
builder
@@ -648,13 +648,13 @@ private static Builder initDefaults(Builder builder) {
648648
.setPollingAlgorithm(
649649
OperationTimedPollAlgorithm.create(
650650
RetrySettings.newBuilder()
651-
.setInitialRetryDelay(Duration.ofMillis(500L))
651+
.setInitialRetryDelay(Duration.ofMillis(20000L))
652652
.setRetryDelayMultiplier(1.5)
653-
.setMaxRetryDelay(Duration.ofMillis(5000L))
653+
.setMaxRetryDelay(Duration.ofMillis(45000L))
654654
.setInitialRpcTimeout(Duration.ZERO)
655655
.setRpcTimeoutMultiplier(1.0)
656656
.setMaxRpcTimeout(Duration.ZERO)
657-
.setTotalTimeout(Duration.ofMillis(300000L))
657+
.setTotalTimeout(Duration.ofMillis(86400000L))
658658
.build()));
659659

660660
builder
@@ -672,13 +672,13 @@ private static Builder initDefaults(Builder builder) {
672672
.setPollingAlgorithm(
673673
OperationTimedPollAlgorithm.create(
674674
RetrySettings.newBuilder()
675-
.setInitialRetryDelay(Duration.ofMillis(500L))
675+
.setInitialRetryDelay(Duration.ofMillis(20000L))
676676
.setRetryDelayMultiplier(1.5)
677-
.setMaxRetryDelay(Duration.ofMillis(5000L))
677+
.setMaxRetryDelay(Duration.ofMillis(45000L))
678678
.setInitialRpcTimeout(Duration.ZERO)
679679
.setRpcTimeoutMultiplier(1.0)
680680
.setMaxRpcTimeout(Duration.ZERO)
681-
.setTotalTimeout(Duration.ofMillis(300000L))
681+
.setTotalTimeout(Duration.ofMillis(86400000L))
682682
.build()));
683683

684684
builder
@@ -696,13 +696,13 @@ private static Builder initDefaults(Builder builder) {
696696
.setPollingAlgorithm(
697697
OperationTimedPollAlgorithm.create(
698698
RetrySettings.newBuilder()
699-
.setInitialRetryDelay(Duration.ofMillis(500L))
699+
.setInitialRetryDelay(Duration.ofMillis(20000L))
700700
.setRetryDelayMultiplier(1.5)
701-
.setMaxRetryDelay(Duration.ofMillis(5000L))
701+
.setMaxRetryDelay(Duration.ofMillis(45000L))
702702
.setInitialRpcTimeout(Duration.ZERO)
703703
.setRpcTimeoutMultiplier(1.0)
704704
.setMaxRpcTimeout(Duration.ZERO)
705-
.setTotalTimeout(Duration.ofMillis(300000L))
705+
.setTotalTimeout(Duration.ofMillis(86400000L))
706706
.build()));
707707

708708
return builder;

0 commit comments

Comments
 (0)