fix: fix retry info algorithm setting (#2562)

mutianf · web-flow · commit c424ccba72a1 · 2025-04-28T15:54:24.000Z
Fix a bug in RetryInfo retry algorithm. 

In the following scenario: error retry delay = 1, error retry delay = 2, error with no retry delay. Currently the client did not set retry delay duration which is default to 0 for the first attempt. This will cause all the subsequent attempts from the same error to not have any retry delay if the retry delay is not present.

The fix sets retry delay duration to be the retry delay from the last attempt. We'll decide if we want to change this behavior later.

Conformance test currently assumes that the client will reset the retry delay. So also disabling the conformance test for now.
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/retrying/RetryInfoRetryAlgorithm.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/gaxx/retrying/RetryInfoRetryAlgorithm.java
@@ -38,6 +38,7 @@ public TimedAttemptSettings createNextAttempt(
     java.time.Duration retryDelay = extractRetryDelay(prevThrowable);
     if (retryDelay != null) {
       return prevSettings.toBuilder()
+          .setRetryDelayDuration(retryDelay)
           .setRandomizedRetryDelayDuration(retryDelay)
           .setAttemptCount(prevSettings.getAttemptCount() + 1)
           .setOverallAttemptCount(prevSettings.getAttemptCount() + 1)
diff --git a/test-proxy/known_failures.txt b/test-proxy/known_failures.txt
@@ -1 +1 @@
-TestExecuteQuery|TestFeatureGap/(traffic_director_enabled|direct_access_requested)
+TestExecuteQuery|TestFeatureGap/(traffic_director_enabled|direct_access_requested)|TestReadRows_Retry_WithRetryInfo_MultipleErrorResponse

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-TestExecuteQuery\|TestFeatureGap/(traffic_director_enabled\|direct_access_requested)`
	`1`	`+TestExecuteQuery\|TestFeatureGap/(traffic_director_enabled\|direct_access_requested)\|TestReadRows_Retry_WithRetryInfo_MultipleErrorResponse`