diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b94ca7b..f70f6317 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
# Changelog
+### [0.122.3](https://www.github.com/googleapis/java-dataproc/compare/v0.122.2...v0.122.3) (2020-06-09)
+
+
+### Bug Fixes
+
+* fix LRO polling and workflow template timeouts ([#213](https://www.github.com/googleapis/java-dataproc/issues/213)) ([c8ebb39](https://www.github.com/googleapis/java-dataproc/commit/c8ebb39e33bc3c622878ecdc4191c80511f95490))
+
### [0.122.2](https://www.github.com/googleapis/java-dataproc/compare/v0.122.1...v0.122.2) (2020-06-06)
diff --git a/README.md b/README.md
index 8478a717..21740076 100644
--- a/README.md
+++ b/README.md
@@ -50,11 +50,11 @@ If you are using Maven without BOM, add this to your dependencies:
If you are using Gradle, add this to your dependencies
```Groovy
-compile 'com.google.cloud:google-cloud-dataproc:0.122.2'
+compile 'com.google.cloud:google-cloud-dataproc:0.122.3'
```
If you are using SBT, add this to your dependencies
```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-dataproc" % "0.122.2"
+libraryDependencies += "com.google.cloud" % "google-cloud-dataproc" % "0.122.3"
```
[//]: # ({x-version-update-end})
diff --git a/google-cloud-dataproc-bom/pom.xml b/google-cloud-dataproc-bom/pom.xml
index 65b4a5ef..fc89f80b 100644
--- a/google-cloud-dataproc-bom/pom.xml
+++ b/google-cloud-dataproc-bom/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.cloud
google-cloud-dataproc-bom
- 0.122.2
+ 0.122.3
pom
com.google.cloud
@@ -64,27 +64,27 @@
com.google.cloud
google-cloud-dataproc
- 0.122.2
+ 0.122.3
com.google.api.grpc
proto-google-cloud-dataproc-v1beta2
- 0.87.2
+ 0.87.3
com.google.api.grpc
grpc-google-cloud-dataproc-v1
- 0.87.2
+ 0.87.3
com.google.api.grpc
proto-google-cloud-dataproc-v1
- 0.87.2
+ 0.87.3
com.google.api.grpc
grpc-google-cloud-dataproc-v1beta2
- 0.87.2
+ 0.87.3
diff --git a/google-cloud-dataproc/pom.xml b/google-cloud-dataproc/pom.xml
index 32d0860e..8131797b 100644
--- a/google-cloud-dataproc/pom.xml
+++ b/google-cloud-dataproc/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.cloud
google-cloud-dataproc
- 0.122.2
+ 0.122.3
jar
Google Cloud Dataproc
https://github.com/googleapis/java-dataproc
@@ -11,7 +11,7 @@
com.google.cloud
google-cloud-dataproc-parent
- 0.122.2
+ 0.122.3
google-cloud-dataproc
diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/ClusterControllerStubSettings.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/ClusterControllerStubSettings.java
index d6007afe..57b70882 100644
--- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/ClusterControllerStubSettings.java
+++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/ClusterControllerStubSettings.java
@@ -470,13 +470,13 @@ private static Builder initDefaults(Builder builder) {
.setPollingAlgorithm(
OperationTimedPollAlgorithm.create(
RetrySettings.newBuilder()
- .setInitialRetryDelay(Duration.ofMillis(500L))
- .setRetryDelayMultiplier(1.5)
- .setMaxRetryDelay(Duration.ofMillis(5000L))
+ .setInitialRetryDelay(Duration.ofMillis(1000L))
+ .setRetryDelayMultiplier(2.0)
+ .setMaxRetryDelay(Duration.ofMillis(10000L))
.setInitialRpcTimeout(Duration.ZERO) // ignored
.setRpcTimeoutMultiplier(1.0) // ignored
.setMaxRpcTimeout(Duration.ZERO) // ignored
- .setTotalTimeout(Duration.ofMillis(300000L))
+ .setTotalTimeout(Duration.ofMillis(900000L))
.build()));
builder
.updateClusterOperationSettings()
@@ -493,13 +493,13 @@ private static Builder initDefaults(Builder builder) {
.setPollingAlgorithm(
OperationTimedPollAlgorithm.create(
RetrySettings.newBuilder()
- .setInitialRetryDelay(Duration.ofMillis(500L))
- .setRetryDelayMultiplier(1.5)
- .setMaxRetryDelay(Duration.ofMillis(5000L))
+ .setInitialRetryDelay(Duration.ofMillis(1000L))
+ .setRetryDelayMultiplier(2.0)
+ .setMaxRetryDelay(Duration.ofMillis(10000L))
.setInitialRpcTimeout(Duration.ZERO) // ignored
.setRpcTimeoutMultiplier(1.0) // ignored
.setMaxRpcTimeout(Duration.ZERO) // ignored
- .setTotalTimeout(Duration.ofMillis(300000L))
+ .setTotalTimeout(Duration.ofMillis(900000L))
.build()));
builder
.deleteClusterOperationSettings()
@@ -516,13 +516,13 @@ private static Builder initDefaults(Builder builder) {
.setPollingAlgorithm(
OperationTimedPollAlgorithm.create(
RetrySettings.newBuilder()
- .setInitialRetryDelay(Duration.ofMillis(500L))
- .setRetryDelayMultiplier(1.5)
- .setMaxRetryDelay(Duration.ofMillis(5000L))
+ .setInitialRetryDelay(Duration.ofMillis(1000L))
+ .setRetryDelayMultiplier(2.0)
+ .setMaxRetryDelay(Duration.ofMillis(10000L))
.setInitialRpcTimeout(Duration.ZERO) // ignored
.setRpcTimeoutMultiplier(1.0) // ignored
.setMaxRpcTimeout(Duration.ZERO) // ignored
- .setTotalTimeout(Duration.ofMillis(300000L))
+ .setTotalTimeout(Duration.ofMillis(900000L))
.build()));
builder
.diagnoseClusterOperationSettings()
@@ -539,13 +539,13 @@ private static Builder initDefaults(Builder builder) {
.setPollingAlgorithm(
OperationTimedPollAlgorithm.create(
RetrySettings.newBuilder()
- .setInitialRetryDelay(Duration.ofMillis(500L))
- .setRetryDelayMultiplier(1.5)
- .setMaxRetryDelay(Duration.ofMillis(5000L))
+ .setInitialRetryDelay(Duration.ofMillis(1000L))
+ .setRetryDelayMultiplier(2.0)
+ .setMaxRetryDelay(Duration.ofMillis(10000L))
.setInitialRpcTimeout(Duration.ZERO) // ignored
.setRpcTimeoutMultiplier(1.0) // ignored
.setMaxRpcTimeout(Duration.ZERO) // ignored
- .setTotalTimeout(Duration.ofMillis(300000L))
+ .setTotalTimeout(Duration.ofMillis(30000L))
.build()));
return builder;
diff --git a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/WorkflowTemplateServiceStubSettings.java b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/WorkflowTemplateServiceStubSettings.java
index db516c66..0e7c505b 100644
--- a/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/WorkflowTemplateServiceStubSettings.java
+++ b/google-cloud-dataproc/src/main/java/com/google/cloud/dataproc/v1/stub/WorkflowTemplateServiceStubSettings.java
@@ -391,10 +391,10 @@ public static class Builder
.setInitialRetryDelay(Duration.ofMillis(100L))
.setRetryDelayMultiplier(1.3)
.setMaxRetryDelay(Duration.ofMillis(60000L))
- .setInitialRpcTimeout(Duration.ofMillis(20000L))
+ .setInitialRpcTimeout(Duration.ofMillis(30000L))
.setRpcTimeoutMultiplier(1.0)
- .setMaxRpcTimeout(Duration.ofMillis(20000L))
- .setTotalTimeout(Duration.ofMillis(600000L))
+ .setMaxRpcTimeout(Duration.ofMillis(30000L))
+ .setTotalTimeout(Duration.ofMillis(900000L))
.build();
definitions.put("default", settings);
RETRY_PARAM_DEFINITIONS = definitions.build();
@@ -500,13 +500,13 @@ private static Builder initDefaults(Builder builder) {
.setPollingAlgorithm(
OperationTimedPollAlgorithm.create(
RetrySettings.newBuilder()
- .setInitialRetryDelay(Duration.ofMillis(500L))
- .setRetryDelayMultiplier(1.5)
- .setMaxRetryDelay(Duration.ofMillis(5000L))
+ .setInitialRetryDelay(Duration.ofMillis(1000L))
+ .setRetryDelayMultiplier(2.0)
+ .setMaxRetryDelay(Duration.ofMillis(10000L))
.setInitialRpcTimeout(Duration.ZERO) // ignored
.setRpcTimeoutMultiplier(1.0) // ignored
.setMaxRpcTimeout(Duration.ZERO) // ignored
- .setTotalTimeout(Duration.ofMillis(300000L))
+ .setTotalTimeout(Duration.ofMillis(43200000L))
.build()));
builder
.instantiateInlineWorkflowTemplateOperationSettings()
@@ -524,13 +524,13 @@ private static Builder initDefaults(Builder builder) {
.setPollingAlgorithm(
OperationTimedPollAlgorithm.create(
RetrySettings.newBuilder()
- .setInitialRetryDelay(Duration.ofMillis(500L))
- .setRetryDelayMultiplier(1.5)
- .setMaxRetryDelay(Duration.ofMillis(5000L))
+ .setInitialRetryDelay(Duration.ofMillis(1000L))
+ .setRetryDelayMultiplier(2.0)
+ .setMaxRetryDelay(Duration.ofMillis(10000L))
.setInitialRpcTimeout(Duration.ZERO) // ignored
.setRpcTimeoutMultiplier(1.0) // ignored
.setMaxRpcTimeout(Duration.ZERO) // ignored
- .setTotalTimeout(Duration.ofMillis(300000L))
+ .setTotalTimeout(Duration.ofMillis(43200000L))
.build()));
return builder;
diff --git a/grpc-google-cloud-dataproc-v1/pom.xml b/grpc-google-cloud-dataproc-v1/pom.xml
index a8cbf63e..6d6d9e03 100644
--- a/grpc-google-cloud-dataproc-v1/pom.xml
+++ b/grpc-google-cloud-dataproc-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
grpc-google-cloud-dataproc-v1
- 0.87.2
+ 0.87.3
grpc-google-cloud-dataproc-v1
GRPC library for grpc-google-cloud-dataproc-v1
com.google.cloud
google-cloud-dataproc-parent
- 0.122.2
+ 0.122.3
diff --git a/grpc-google-cloud-dataproc-v1beta2/pom.xml b/grpc-google-cloud-dataproc-v1beta2/pom.xml
index 91795069..052f83a5 100644
--- a/grpc-google-cloud-dataproc-v1beta2/pom.xml
+++ b/grpc-google-cloud-dataproc-v1beta2/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
grpc-google-cloud-dataproc-v1beta2
- 0.87.2
+ 0.87.3
grpc-google-cloud-dataproc-v1beta2
GRPC library for grpc-google-cloud-dataproc-v1beta2
com.google.cloud
google-cloud-dataproc-parent
- 0.122.2
+ 0.122.3
diff --git a/pom.xml b/pom.xml
index 2401b27c..a85e705c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.google.cloud
google-cloud-dataproc-parent
pom
- 0.122.2
+ 0.122.3
Google Cloud Dataproc Parent
https://github.com/googleapis/java-dataproc
@@ -81,27 +81,27 @@
com.google.api.grpc
proto-google-cloud-dataproc-v1beta2
- 0.87.2
+ 0.87.3
com.google.api.grpc
proto-google-cloud-dataproc-v1
- 0.87.2
+ 0.87.3
com.google.api.grpc
grpc-google-cloud-dataproc-v1
- 0.87.2
+ 0.87.3
com.google.api.grpc
grpc-google-cloud-dataproc-v1beta2
- 0.87.2
+ 0.87.3
com.google.cloud
google-cloud-dataproc
- 0.122.2
+ 0.122.3
diff --git a/proto-google-cloud-dataproc-v1/pom.xml b/proto-google-cloud-dataproc-v1/pom.xml
index 52b655e7..a9c5dd34 100644
--- a/proto-google-cloud-dataproc-v1/pom.xml
+++ b/proto-google-cloud-dataproc-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-cloud-dataproc-v1
- 0.87.2
+ 0.87.3
proto-google-cloud-dataproc-v1
PROTO library for proto-google-cloud-dataproc-v1
com.google.cloud
google-cloud-dataproc-parent
- 0.122.2
+ 0.122.3
diff --git a/proto-google-cloud-dataproc-v1beta2/pom.xml b/proto-google-cloud-dataproc-v1beta2/pom.xml
index 58add563..2fe2be87 100644
--- a/proto-google-cloud-dataproc-v1beta2/pom.xml
+++ b/proto-google-cloud-dataproc-v1beta2/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-cloud-dataproc-v1beta2
- 0.87.2
+ 0.87.3
proto-google-cloud-dataproc-v1beta2
PROTO library for proto-google-cloud-dataproc-v1beta2
com.google.cloud
google-cloud-dataproc-parent
- 0.122.2
+ 0.122.3
diff --git a/synth.metadata b/synth.metadata
index 5b97be54..ed1ef450 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,23 +4,23 @@
"git": {
"name": ".",
"remote": "https://github.com/googleapis/java-dataproc.git",
- "sha": "0295e36c41b54d09e814d391f7e56349c91619ff"
+ "sha": "d1903ac932de256fd813b12b1f15e3cccb45d811"
}
},
{
"git": {
"name": "googleapis",
"remote": "https://github.com/googleapis/googleapis.git",
- "sha": "150cfa0d994f9656c57eb4ed50f49c2f2add93f2",
- "internalRef": "314840739"
+ "sha": "60c7a4c6e8d1f4e4179d46bbad6239abc898dc40",
+ "internalRef": "315548051"
}
},
{
"git": {
"name": "googleapis",
"remote": "https://github.com/googleapis/googleapis.git",
- "sha": "150cfa0d994f9656c57eb4ed50f49c2f2add93f2",
- "internalRef": "314840739"
+ "sha": "60c7a4c6e8d1f4e4179d46bbad6239abc898dc40",
+ "internalRef": "315548051"
}
},
{
diff --git a/versions.txt b/versions.txt
index 193e7a05..3d49f228 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,8 +1,8 @@
# Format:
# module:released-version:current-version
-proto-google-cloud-dataproc-v1beta2:0.87.2:0.87.2
-proto-google-cloud-dataproc-v1:0.87.2:0.87.2
-grpc-google-cloud-dataproc-v1:0.87.2:0.87.2
-grpc-google-cloud-dataproc-v1beta2:0.87.2:0.87.2
-google-cloud-dataproc:0.122.2:0.122.2
+proto-google-cloud-dataproc-v1beta2:0.87.3:0.87.3
+proto-google-cloud-dataproc-v1:0.87.3:0.87.3
+grpc-google-cloud-dataproc-v1:0.87.3:0.87.3
+grpc-google-cloud-dataproc-v1beta2:0.87.3:0.87.3
+google-cloud-dataproc:0.122.3:0.122.3