Add a SandboxedSpawnActionContext interface and implementations for our sandboxed execution strategies.

--
MOS_MIGRATED_REVID=134054610

3 files changed, 47 insertions, 10 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/DarwinSandboxedStrategy.java b/src/main/java/com/google/devtools/build/lib/sandbox/DarwinSandboxedStrategy.java
index 8363ffb36b..dac9e58924 100644
--- a/src/main/java/com/google/devtools/build/lib/sandbox/DarwinSandboxedStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/DarwinSandboxedStrategy.java
@@ -54,6 +54,7 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
 
 /** Strategy that uses sandboxing to execute a process, for Darwin */
 @ExecutionStrategy(
@@ -147,7 +148,16 @@ public class DarwinSandboxedStrategy extends SandboxStrategy {
 
   @Override
   public void exec(Spawn spawn, ActionExecutionContext actionExecutionContext)
-      throws ExecException {
+      throws ExecException, InterruptedException {
+    exec(spawn, actionExecutionContext, null);
+  }
+
+  @Override
+  public void exec(
+      Spawn spawn,
+      ActionExecutionContext actionExecutionContext,
+      AtomicReference<Class<? extends SpawnActionContext>> writeOutputFiles)
+      throws ExecException, InterruptedException {
     Executor executor = actionExecutionContext.getExecutor();
 
     // Certain actions can't run remotely or in a sandbox - pass them on to the standalone strategy.
@@ -210,7 +220,12 @@ public class DarwinSandboxedStrategy extends SandboxStrategy {
             Spawns.getTimeoutSeconds(spawn),
             SandboxHelpers.shouldAllowNetwork(buildRequest, spawn));
       } finally {
-        hardlinkedExecRoot.copyOutputs(execRoot, outputs);
+        if (writeOutputFiles != null
+            && !writeOutputFiles.compareAndSet(null, DarwinSandboxedStrategy.class)) {
+          Thread.currentThread().interrupt();
+        } else {
+          hardlinkedExecRoot.copyOutputs(execRoot, outputs);
+        }
         if (!sandboxDebug) {
           SandboxHelpers.lazyCleanup(backgroundWorkers, runner);
         }
@@ -218,6 +233,10 @@ public class DarwinSandboxedStrategy extends SandboxStrategy {
     } catch (IOException e) {
       throw new UserExecException("I/O error during sandboxed execution", e);
     }
+
+    if (Thread.interrupted()) {
+      throw new InterruptedException();
+    }
   }
 
   @Override
diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedStrategy.java b/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedStrategy.java
index 808da2fa22..d07943a469 100644
--- a/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedStrategy.java
@@ -34,6 +34,7 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
 
 /** Strategy that uses sandboxing to execute a process. */
 @ExecutionStrategy(
@@ -81,12 +82,19 @@ public class LinuxSandboxedStrategy extends SandboxStrategy {
     this.fullySupported = fullySupported;
   }
 
-  /**
-   * Executes the given {@code spawn}.
-   */
+  /** Executes the given {@code spawn}. */
   @Override
   public void exec(Spawn spawn, ActionExecutionContext actionExecutionContext)
-      throws ExecException {
+      throws ExecException, InterruptedException {
+    exec(spawn, actionExecutionContext, null);
+  }
+
+  @Override
+  public void exec(
+      Spawn spawn,
+      ActionExecutionContext actionExecutionContext,
+      AtomicReference<Class<? extends SpawnActionContext>> writeOutputFiles)
+      throws ExecException, InterruptedException {
     Executor executor = actionExecutionContext.getExecutor();
 
     // Certain actions can't run remotely or in a sandbox - pass them on to the standalone strategy.
@@ -129,6 +137,7 @@ public class LinuxSandboxedStrategy extends SandboxStrategy {
       } else {
         runner = new ProcessWrapperRunner(execRoot, sandboxPath, sandboxExecRoot, verboseFailures);
       }
+
       try {
         runner.run(
             spawn.getArguments(),
@@ -137,7 +146,13 @@ public class LinuxSandboxedStrategy extends SandboxStrategy {
             Spawns.getTimeoutSeconds(spawn),
             SandboxHelpers.shouldAllowNetwork(buildRequest, spawn));
       } finally {
-        symlinkedExecRoot.copyOutputs(execRoot, outputs);
+        if (writeOutputFiles != null
+            && !writeOutputFiles.compareAndSet(null, LinuxSandboxedStrategy.class)) {
+          Thread.currentThread().interrupt();
+        } else {
+          symlinkedExecRoot.copyOutputs(execRoot, outputs);
+        }
+
         if (!sandboxOptions.sandboxDebug) {
           SandboxHelpers.lazyCleanup(backgroundWorkers, runner);
         }
@@ -145,6 +160,10 @@ public class LinuxSandboxedStrategy extends SandboxStrategy {
     } catch (IOException e) {
       throw new UserExecException("I/O error during sandboxed execution", e);
     }
+
+    if (Thread.interrupted()) {
+      throw new InterruptedException();
+    }
   }
 
   private ImmutableSet<Path> getBindMounts(BlazeDirectories blazeDirs) {
@@ -159,5 +178,4 @@ public class LinuxSandboxedStrategy extends SandboxStrategy {
     }
     return bindMounts.build();
   }
-
 }
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 7a12e9b600..6b5c3ed64b 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
@@ -19,8 +19,8 @@ import com.google.common.collect.ImmutableSet.Builder;
 import com.google.devtools.build.lib.actions.ActionExecutionContext;
 import com.google.devtools.build.lib.actions.EnvironmentalExecException;
 import com.google.devtools.build.lib.actions.ExecException;
+import com.google.devtools.build.lib.actions.SandboxedSpawnActionContext;
 import com.google.devtools.build.lib.actions.Spawn;
-import com.google.devtools.build.lib.actions.SpawnActionContext;
 import com.google.devtools.build.lib.analysis.BlazeDirectories;
 import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.build.lib.vfs.PathFragment;
@@ -28,7 +28,7 @@ import java.io.IOException;
 import java.util.Map;
 
 /** Abstract common ancestor for sandbox strategies implementing the common parts. */
-abstract class SandboxStrategy implements SpawnActionContext {
+abstract class SandboxStrategy implements SandboxedSpawnActionContext {
 
   private final BlazeDirectories blazeDirs;
   private final boolean verboseFailures;