Add the workspace name to the sandbox path for sandboxed workers.

PiperOrigin-RevId: 165571541

1 files changed, 8 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/worker/WorkerFactory.java b/src/main/java/com/google/devtools/build/lib/worker/WorkerFactory.java
index 1e0e611cab..6f75fcf29d 100644
--- a/src/main/java/com/google/devtools/build/lib/worker/WorkerFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/worker/WorkerFactory.java
@@ -60,7 +60,7 @@ final class WorkerFactory extends BaseKeyedPooledObjectFactory<WorkerKey, Worker
     Worker worker;
     boolean sandboxed = workerOptions.workerSandboxing || key.mustBeSandboxed();
     if (sandboxed) {
-      Path workDir = workerBaseDir.getRelative("worker-" + workerId + "-" + key.getMnemonic());
+      Path workDir = getSandboxedWorkerPath(key, workerId);
       worker = new SandboxedWorker(key, workerId, workDir, logFile);
     } else {
       worker = new Worker(key, workerId, key.getExecRoot(), logFile);
@@ -80,6 +80,13 @@ final class WorkerFactory extends BaseKeyedPooledObjectFactory<WorkerKey, Worker
     return worker;
   }
 
+  Path getSandboxedWorkerPath(WorkerKey key, int workerId) {
+    String workspaceName = key.getExecRoot().getBaseName();
+    return workerBaseDir
+        .getRelative("worker-" + workerId + "-" + key.getMnemonic())
+        .getRelative(workspaceName);
+  }
+
   /**
    * Use the DefaultPooledObject implementation.
    */