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

Commit c8ebb39

Browse files
yoshi-automationyoshi-automation
authored
fix: fix LRO polling and workflow template timeouts (#213)
This PR was generated using Autosynth. 🌈 Synth log will be available here: https://source.cloud.google.com/results/invocations/6ddd5311-0ad1-48dc-b18d-8b11b966c273/targets - [ ] To automatically regenerate this PR, check this box. PiperOrigin-RevId: 315548051 Source-Link: googleapis/googleapis@60c7a4c PiperOrigin-RevId: 315516848 Source-Link: googleapis/googleapis@148a3ca
1 parent d1903ac commit c8ebb39

File tree

3 files changed

+32
-32
lines changed

3 files changed

+32
-32
lines changed

‎google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/ClusterControllerStubSettings.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -470,13 +470,13 @@ private static Builder initDefaults(Builder builder) {
470470
.setPollingAlgorithm(
471471
OperationTimedPollAlgorithm.create(
472472
RetrySettings.newBuilder()
473-
.setInitialRetryDelay(Duration.ofMillis(500L))
474-
.setRetryDelayMultiplier(1.5)
475-
.setMaxRetryDelay(Duration.ofMillis(5000L))
473+
.setInitialRetryDelay(Duration.ofMillis(1000L))
474+
.setRetryDelayMultiplier(2.0)
475+
.setMaxRetryDelay(Duration.ofMillis(10000L))
476476
.setInitialRpcTimeout(Duration.ZERO) // ignored
477477
.setRpcTimeoutMultiplier(1.0) // ignored
478478
.setMaxRpcTimeout(Duration.ZERO) // ignored
479-
.setTotalTimeout(Duration.ofMillis(300000L))
479+
.setTotalTimeout(Duration.ofMillis(900000L))
480480
.build()));
481481
builder
482482
.updateClusterOperationSettings()
@@ -493,13 +493,13 @@ private static Builder initDefaults(Builder builder) {
493493
.setPollingAlgorithm(
494494
OperationTimedPollAlgorithm.create(
495495
RetrySettings.newBuilder()
496-
.setInitialRetryDelay(Duration.ofMillis(500L))
497-
.setRetryDelayMultiplier(1.5)
498-
.setMaxRetryDelay(Duration.ofMillis(5000L))
496+
.setInitialRetryDelay(Duration.ofMillis(1000L))
497+
.setRetryDelayMultiplier(2.0)
498+
.setMaxRetryDelay(Duration.ofMillis(10000L))
499499
.setInitialRpcTimeout(Duration.ZERO) // ignored
500500
.setRpcTimeoutMultiplier(1.0) // ignored
501501
.setMaxRpcTimeout(Duration.ZERO) // ignored
502-
.setTotalTimeout(Duration.ofMillis(300000L))
502+
.setTotalTimeout(Duration.ofMillis(900000L))
503503
.build()));
504504
builder
505505
.deleteClusterOperationSettings()
@@ -516,13 +516,13 @@ private static Builder initDefaults(Builder builder) {
516516
.setPollingAlgorithm(
517517
OperationTimedPollAlgorithm.create(
518518
RetrySettings.newBuilder()
519-
.setInitialRetryDelay(Duration.ofMillis(500L))
520-
.setRetryDelayMultiplier(1.5)
521-
.setMaxRetryDelay(Duration.ofMillis(5000L))
519+
.setInitialRetryDelay(Duration.ofMillis(1000L))
520+
.setRetryDelayMultiplier(2.0)
521+
.setMaxRetryDelay(Duration.ofMillis(10000L))
522522
.setInitialRpcTimeout(Duration.ZERO) // ignored
523523
.setRpcTimeoutMultiplier(1.0) // ignored
524524
.setMaxRpcTimeout(Duration.ZERO) // ignored
525-
.setTotalTimeout(Duration.ofMillis(300000L))
525+
.setTotalTimeout(Duration.ofMillis(900000L))
526526
.build()));
527527
builder
528528
.diagnoseClusterOperationSettings()
@@ -539,13 +539,13 @@ private static Builder initDefaults(Builder builder) {
539539
.setPollingAlgorithm(
540540
OperationTimedPollAlgorithm.create(
541541
RetrySettings.newBuilder()
542-
.setInitialRetryDelay(Duration.ofMillis(500L))
543-
.setRetryDelayMultiplier(1.5)
544-
.setMaxRetryDelay(Duration.ofMillis(5000L))
542+
.setInitialRetryDelay(Duration.ofMillis(1000L))
543+
.setRetryDelayMultiplier(2.0)
544+
.setMaxRetryDelay(Duration.ofMillis(10000L))
545545
.setInitialRpcTimeout(Duration.ZERO) // ignored
546546
.setRpcTimeoutMultiplier(1.0) // ignored
547547
.setMaxRpcTimeout(Duration.ZERO) // ignored
548-
.setTotalTimeout(Duration.ofMillis(300000L))
548+
.setTotalTimeout(Duration.ofMillis(30000L))
549549
.build()));
550550

551551
return builder;

‎google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/WorkflowTemplateServiceStubSettings.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -391,10 +391,10 @@ public static class Builder
391391
.setInitialRetryDelay(Duration.ofMillis(100L))
392392
.setRetryDelayMultiplier(1.3)
393393
.setMaxRetryDelay(Duration.ofMillis(60000L))
394-
.setInitialRpcTimeout(Duration.ofMillis(20000L))
394+
.setInitialRpcTimeout(Duration.ofMillis(30000L))
395395
.setRpcTimeoutMultiplier(1.0)
396-
.setMaxRpcTimeout(Duration.ofMillis(20000L))
397-
.setTotalTimeout(Duration.ofMillis(600000L))
396+
.setMaxRpcTimeout(Duration.ofMillis(30000L))
397+
.setTotalTimeout(Duration.ofMillis(900000L))
398398
.build();
399399
definitions.put("default", settings);
400400
RETRY_PARAM_DEFINITIONS = definitions.build();
@@ -500,13 +500,13 @@ private static Builder initDefaults(Builder builder) {
500500
.setPollingAlgorithm(
501501
OperationTimedPollAlgorithm.create(
502502
RetrySettings.newBuilder()
503-
.setInitialRetryDelay(Duration.ofMillis(500L))
504-
.setRetryDelayMultiplier(1.5)
505-
.setMaxRetryDelay(Duration.ofMillis(5000L))
503+
.setInitialRetryDelay(Duration.ofMillis(1000L))
504+
.setRetryDelayMultiplier(2.0)
505+
.setMaxRetryDelay(Duration.ofMillis(10000L))
506506
.setInitialRpcTimeout(Duration.ZERO) // ignored
507507
.setRpcTimeoutMultiplier(1.0) // ignored
508508
.setMaxRpcTimeout(Duration.ZERO) // ignored
509-
.setTotalTimeout(Duration.ofMillis(300000L))
509+
.setTotalTimeout(Duration.ofMillis(43200000L))
510510
.build()));
511511
builder
512512
.instantiateInlineWorkflowTemplateOperationSettings()
@@ -524,13 +524,13 @@ private static Builder initDefaults(Builder builder) {
524524
.setPollingAlgorithm(
525525
OperationTimedPollAlgorithm.create(
526526
RetrySettings.newBuilder()
527-
.setInitialRetryDelay(Duration.ofMillis(500L))
528-
.setRetryDelayMultiplier(1.5)
529-
.setMaxRetryDelay(Duration.ofMillis(5000L))
527+
.setInitialRetryDelay(Duration.ofMillis(1000L))
528+
.setRetryDelayMultiplier(2.0)
529+
.setMaxRetryDelay(Duration.ofMillis(10000L))
530530
.setInitialRpcTimeout(Duration.ZERO) // ignored
531531
.setRpcTimeoutMultiplier(1.0) // ignored
532532
.setMaxRpcTimeout(Duration.ZERO) // ignored
533-
.setTotalTimeout(Duration.ofMillis(300000L))
533+
.setTotalTimeout(Duration.ofMillis(43200000L))
534534
.build()));
535535

536536
return builder;

‎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-dataproc.git",
7-
"sha": "0295e36c41b54d09e814d391f7e56349c91619ff"
7+
"sha": "d1903ac932de256fd813b12b1f15e3cccb45d811"
88
}
99
},
1010
{
1111
"git": {
1212
"name": "googleapis",
1313
"remote": "https://github.com/googleapis/googleapis.git",
14-
"sha": "150cfa0d994f9656c57eb4ed50f49c2f2add93f2",
15-
"internalRef": "314840739"
14+
"sha": "60c7a4c6e8d1f4e4179d46bbad6239abc898dc40",
15+
"internalRef": "315548051"
1616
}
1717
},
1818
{
1919
"git": {
2020
"name": "googleapis",
2121
"remote": "https://github.com/googleapis/googleapis.git",
22-
"sha": "150cfa0d994f9656c57eb4ed50f49c2f2add93f2",
23-
"internalRef": "314840739"
22+
"sha": "60c7a4c6e8d1f4e4179d46bbad6239abc898dc40",
23+
"internalRef": "315548051"
2424
}
2525
},
2626
{

0 commit comments

Comments
 (0)