gax 1.45 uses totalTimeout also when retries have been disabled (#5283)

olavloite · sduskis · commit e4f56e855ca1 · 2019-06-03T14:43:51.000-04:00
Gax 1.44 ignored the totalTimeout that had been set on RetrySettings if
the retry codes had been set to an empty set, effectively disabling all
retries. In gax 1.45, the totalTimeout setting is used and will cause a
timeout also when no retry codes have been set.
diff --git a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseAdminGaxTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseAdminGaxTest.java
@@ -233,7 +233,7 @@ public void setUp() throws Exception {
             .setInitialRpcTimeout(Duration.ofMillis(200L))
             .setMaxRpcTimeout(Duration.ofMillis(200L))
             .setMaxAttempts(3)
-            .setTotalTimeout(Duration.ofMillis(500L))
+            .setTotalTimeout(Duration.ofMillis(1500L))
             .build();
     SpannerOptions.Builder builder =
         SpannerOptions.newBuilder()
diff --git a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/InstanceAdminGaxTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/InstanceAdminGaxTest.java
@@ -236,7 +236,7 @@ public void setUp() throws Exception {
             .setInitialRpcTimeout(Duration.ofMillis(200L))
             .setMaxRpcTimeout(Duration.ofMillis(200L))
             .setMaxAttempts(3)
-            .setTotalTimeout(Duration.ofMillis(500L))
+            .setTotalTimeout(Duration.ofMillis(1500L))
             .build();
     SpannerOptions.Builder builder =
         SpannerOptions.newBuilder()
diff --git a/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerGaxRetryTest.java b/google-cloud-clients/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerGaxRetryTest.java
@@ -201,7 +201,7 @@ public void setUp() throws Exception {
             .setInitialRpcTimeout(Duration.ofMillis(500L))
             .setMaxRpcTimeout(Duration.ofMillis(500L))
             .setMaxAttempts(3)
-            .setTotalTimeout(Duration.ofMillis(1000L))
+            .setTotalTimeout(Duration.ofMillis(1500L))
             .build();
     RetrySettings commitRetrySettings =
         RetrySettings.newBuilder()
