Fix retries that timeout hanging forever. (#10855)

larry-safran · web-flow · commit c0a9d315d3cb · 2024-01-31T13:15:35.000-08:00
Fixes #10336
diff --git a/core/src/main/java/io/grpc/internal/RetriableStream.java b/core/src/main/java/io/grpc/internal/RetriableStream.java
@@ -195,7 +195,10 @@ public void run() {
             }
           }
           if (retryFuture != null) {
-            retryFuture.cancel(false);
+            boolean cancelled = retryFuture.cancel(false);
+            if (cancelled) {
+              inFlightSubStreams.decrementAndGet();
+            }
           }
           if (hedgingFuture != null) {
             hedgingFuture.cancel(false);

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,10 @@ public void run() {`
`195`	`195`	`}`
`196`	`196`	`}`
`197`	`197`	`if (retryFuture != null) {`
`198`		`- retryFuture.cancel(false);`
	`198`	`+ boolean cancelled = retryFuture.cancel(false);`
	`199`	`+ if (cancelled) {`
	`200`	`+ inFlightSubStreams.decrementAndGet();`
	`201`	`+ }`
`199`	`202`	`}`
`200`	`203`	`if (hedgingFuture != null) {`
`201`	`204`	`hedgingFuture.cancel(false);`