From eb763192c865df8e5aaeadd4ad45846170fe7517 Mon Sep 17 00:00:00 2001 From: Olav Loite Date: Mon, 3 Jun 2019 18:59:29 +0200 Subject: [PATCH] gax 1.45 uses totalTimeout also when retries have been disabled 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. --- .../java/com/google/cloud/spanner/DatabaseAdminGaxTest.java | 2 +- .../java/com/google/cloud/spanner/InstanceAdminGaxTest.java | 2 +- .../test/java/com/google/cloud/spanner/SpannerGaxRetryTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 index ab6dd31d86fb..da18c57c278d 100644 --- 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 index a50bdafe7b93..ce318af0624d 100644 --- 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 index d1535c8d2bc0..f92737bfea9b 100644 --- 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()