commit 776522666ee340e85411c6af95e093ee88c91a14
author Googler <larsrc@google.com> Thu Dec 01 02:15:33 2022 -0800
committer Copybara-Service <copybara-worker@google.com> Thu Dec 01 02:17:23 2022 -0800
tree e649edbba5f41a0376b8e98689f9b4e9f991b431
parent c0bbb0f6d9ae1633b6af84a292b58036bbcd0f89

Add integration tests for the experimental hardened worker sandbox. Fixes the problem where the worker sandbox would die due to the parent _thread_ dying by adding a linux-sandbox flag for persistent processes.

PiperOrigin-RevId: 492139916
Change-Id: Icf952a19530f447e916c801d6e512f13eb4b295d

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

diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxCommandLineBuilder.java b/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxCommandLineBuilder.java
index 60e6bcd..8d03d61 100644
--- a/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxCommandLineBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxCommandLineBuilder.java
@@ -38,6 +38,7 @@
   private Path workingDirectory;
   private Duration timeout;
   private Duration killDelay;
+  private boolean persistentProcess;
   private Path stdoutPath;
   private Path stderrPath;
   private Set<Path> writableFilesAndDirectories = ImmutableSet.of();
@@ -97,6 +98,12 @@
     return this;
   }
 
+  @CanIgnoreReturnValue
+  public LinuxSandboxCommandLineBuilder setPersistentProcess(boolean persistentProcess) {
+    this.persistentProcess = persistentProcess;
+    return this;
+  }
+
   /** Sets the path to use for redirecting stdout, if any. */
   @CanIgnoreReturnValue
   public LinuxSandboxCommandLineBuilder setStdoutPath(Path stdoutPath) {
@@ -263,6 +270,9 @@
     if (sigintSendsSigterm) {
       commandLineBuilder.add("-i");
     }
+    if (persistentProcess) {
+      commandLineBuilder.add("-p");
+    }
     commandLineBuilder.add("--");
     commandLineBuilder.addAll(commandArguments);