Remote: Fix crashes with InterruptedException when using http cache. (bazelbuild#14999)

brentleyjones · coeuvre · web-flow · commit 6cd6a27d4480 · 2022-03-09T05:38:09.000+11:00
Also cancels tasks submitted during `afterCommand` if interrupted. Fixes bazelbuild#14787. Closes bazelbuild#14992. PiperOrigin-RevId: 433205726 (cherry picked from commit a73aa12) Co-authored-by: Chi Wang <chiwang@google.com>
diff --git a/src/main/java/com/google/devtools/build/lib/remote/http/HttpCacheClient.java b/src/main/java/com/google/devtools/build/lib/remote/http/HttpCacheClient.java
@@ -733,7 +733,23 @@ public void close() {
       }
 
       isClosed = true;
-      channelPool.close();
+
+      // Clear interrupted status to prevent failure to close, indicated with #14787
+      boolean wasInterrupted = Thread.interrupted();
+      try {
+        channelPool.close();
+      } catch (RuntimeException e) {
+        if (e.getCause() instanceof InterruptedException) {
+          Thread.currentThread().interrupt();
+        } else {
+          throw e;
+        }
+      } finally {
+        if (wasInterrupted) {
+          Thread.currentThread().interrupt();
+        }
+      }
+
       eventLoop.shutdownGracefully();
     }
   }
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlockWaitingModule.java b/src/main/java/com/google/devtools/build/lib/runtime/BlockWaitingModule.java
@@ -51,6 +51,7 @@ public void afterCommand() throws AbruptExitException {
     try {
       executorService.awaitTermination(Long.MAX_VALUE, SECONDS);
     } catch (InterruptedException e) {
+      executorService.shutdownNow();
       Thread.currentThread().interrupt();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ public void afterCommand() throws AbruptExitException {`
`51`	`51`	`try {`
`52`	`52`	`executorService.awaitTermination(Long.MAX_VALUE, SECONDS);`
`53`	`53`	`} catch (InterruptedException e) {`
	`54`	`+ executorService.shutdownNow();`
`54`	`55`	`Thread.currentThread().interrupt();`
`55`	`56`	`}`
`56`	`57`