commit a7827c8d1b4f6d3adc0c247adab34310ae3cc566
author Philipp Wollermann <philwo@google.com> Mon Sep 26 16:21:22 2016 +0000
committer Yun Peng <pcloudy@google.com> Mon Sep 26 17:49:03 2016 +0000
tree 63d8523ed52ed4f4349905d1c436196f5e7d2840
parent a27949e27d4335216c28e77c41d078e338b5d4fb

Fix an issue where a "build" command might hang after it finished, because sandbox directories could not be cleaned up.

--
MOS_MIGRATED_REVID=134286101

src/main/java/com/google/devtools/build/lib/sandbox/SandboxStrategy.java

diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/SandboxStrategy.java b/src/main/java/com/google/devtools/build/lib/sandbox/SandboxStrategy.java
index d02ffc2..b5d787c 100644
--- a/src/main/java/com/google/devtools/build/lib/sandbox/SandboxStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/SandboxStrategy.java
@@ -26,6 +26,7 @@
 import com.google.devtools.build.lib.analysis.BlazeDirectories;
 import com.google.devtools.build.lib.buildtool.BuildRequest;
 import com.google.devtools.build.lib.events.Event;
+import com.google.devtools.build.lib.events.EventHandler;
 import com.google.devtools.build.lib.util.Preconditions;
 import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.build.lib.vfs.PathFragment;
@@ -70,6 +71,7 @@
       SandboxRunner runner,
       AtomicReference<Class<? extends SpawnActionContext>> writeOutputFiles)
       throws ExecException, InterruptedException {
+    EventHandler eventHandler = actionExecutionContext.getExecutor().getEventHandler();
     try {
       runner.run(
           spawn.getArguments(),
@@ -90,17 +92,14 @@
         } catch (IOException e) {
           // Catch the IOException and turn it into an error message, otherwise this might hide an
           // exception thrown during runner.run earlier.
-          actionExecutionContext
-              .getExecutor()
-              .getEventHandler()
-              .handle(
-                  Event.error(
-                      "I/O exception while extracting output artifacts from sandboxed execution: "
-                          + e));
+          eventHandler.handle(
+              Event.error(
+                  "I/O exception while extracting output artifacts from sandboxed execution: "
+                      + e));
         }
       }
       if (!sandboxOptions.sandboxDebug) {
-        SandboxHelpers.lazyCleanup(backgroundWorkers, runner);
+        SandboxHelpers.lazyCleanup(backgroundWorkers, eventHandler, runner);
       }
     }