Do not try to read from the stdout/stderr streams of destroyed processes.

According to https://bugs.openjdk.java.net/browse/JDK-4311711 , the behavior is undefined and it reproducibly results in hangs on Windows.

This makes Ctrl-C on be able to interrupt Bazel during the execution phase, too. There are no guarantees about actually killing the child processes, though: Process.destroy() apparently leaves some child processes running. Unfortunately, Java doesn't offer a solution to this, so we'll have to resort to native code in some way.

--
MOS_MIGRATED_REVID=125758911

1 files changed, 6 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/shell/Command.java b/src/main/java/com/google/devtools/build/lib/shell/Command.java
index 1301fa1780..e7417e9543 100644
--- a/src/main/java/com/google/devtools/build/lib/shell/Command.java
+++ b/src/main/java/com/google/devtools/build/lib/shell/Command.java
@@ -824,7 +824,12 @@ public final class Command {
     log.finer(status.toString());
 
     try {
-      outErr.waitForCompletion();
+      if (Thread.interrupted()) {
+        outErr.cancel();
+        Thread.currentThread().interrupt();
+      } else {
+        outErr.waitForCompletion();
+      }
     } catch (IOException ioe) {
       CommandResult noOutputResult =
         new CommandResult(CommandResult.EMPTY_OUTPUT,