When in use, always return ActionFS paths from the ActionExecutionContext. Instead,defer to ActionFS regarding the choice about delegation to top-level Filesystem.

RELNOTES: None
PiperOrigin-RevId: 197960416

1 files changed, 7 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/actions/ActionExecutionContext.java b/src/main/java/com/google/devtools/build/lib/actions/ActionExecutionContext.java
index eae8b9c58a..b1bd6f6eca 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/ActionExecutionContext.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/ActionExecutionContext.java
@@ -146,11 +146,16 @@ public class ActionExecutionContext implements Closeable {
   }
 
   public FileSystem getFileSystem() {
+    if (actionFileSystem != null) {
+      return actionFileSystem;
+    }
     return executor.getFileSystem();
   }
 
   public Path getExecRoot() {
-    return executor.getExecRoot();
+    return actionFileSystem != null
+        ? actionFileSystem.getPath(executor.getExecRoot().asFragment())
+        : executor.getExecRoot();
   }
 
   /**
@@ -170,7 +175,7 @@ public class ActionExecutionContext implements Closeable {
       }
       return artifact.getPath();
     }
-    return executor.getExecRoot().getRelative(input.getExecPath());
+    return getExecRoot().getRelative(input.getExecPath());
   }
 
   public Root getRoot(Artifact artifact) {