Revert "Fix retries that timeout hanging forever. (#10855)" (#10901)

larry-safran · web-flow · commit 5faab7f47ef6 · 2024-02-07T15:05:21.000-08:00
This reverts commit c0a9d31.
diff --git a/core/src/main/java/io/grpc/internal/RetriableStream.java b/core/src/main/java/io/grpc/internal/RetriableStream.java
@@ -195,10 +195,7 @@ public void run() {
             }
           }
           if (retryFuture != null) {
-            boolean cancelled = retryFuture.cancel(false);
-            if (cancelled) {
-              inFlightSubStreams.decrementAndGet();
-            }
+            retryFuture.cancel(false);
           }
           if (hedgingFuture != null) {
             hedgingFuture.cancel(false);

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