commit 29235b023133fa51d5d1017eb44c4b1da8978ed2
author Jakob Buchgraber <buchgr@google.com> Mon Jan 21 04:55:11 2019 -0800
committer Copybara-Service <copybara-piper@google.com> Mon Jan 21 04:57:07 2019 -0800
tree 069ea68a6928b508ec963365cac417a4253b18b7
parent 22d375bd532b04bb83f18a7770e5080e23a1d517

remote: fix callside with incorrect path construction

Like #7174, but only affecting remote execution. Also,
incorporate feedback from #7174 and rename toPath to toInputPath.

Closes #7181.

PiperOrigin-RevId: 230211153

src/main/java/com/google/devtools/build/lib/actions/ActionInputHelper.java

diff --git a/src/main/java/com/google/devtools/build/lib/actions/ActionInputHelper.java b/src/main/java/com/google/devtools/build/lib/actions/ActionInputHelper.java
index 23eab41..49c9f5d 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/ActionInputHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/ActionInputHelper.java
@@ -221,7 +221,7 @@
   }
 
   /** Returns the {@link Path} for an {@link ActionInput}. */
-  public static Path toPath(ActionInput input, Path execRoot) {
+  public static Path toInputPath(ActionInput input, Path execRoot) {
     Preconditions.checkNotNull(input, "input");
     Preconditions.checkNotNull(execRoot, "execRoot");
 

src/main/java/com/google/devtools/build/lib/exec/SingleBuildFileCache.java

diff --git a/src/main/java/com/google/devtools/build/lib/exec/SingleBuildFileCache.java b/src/main/java/com/google/devtools/build/lib/exec/SingleBuildFileCache.java
index ee1ad40..d1e7bf5 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/SingleBuildFileCache.java
+++ b/src/main/java/com/google/devtools/build/lib/exec/SingleBuildFileCache.java
@@ -60,7 +60,7 @@
           .get(
               input.getExecPathString(),
               () -> {
-                Path path = ActionInputHelper.toPath(input, execRoot);
+                Path path = ActionInputHelper.toInputPath(input, execRoot);
                 try {
                   FileArtifactValue metadata = FileArtifactValue.create(path);
                   if (metadata.getType().isDirectory()) {

src/main/java/com/google/devtools/build/lib/remote/Chunker.java

diff --git a/src/main/java/com/google/devtools/build/lib/remote/Chunker.java b/src/main/java/com/google/devtools/build/lib/remote/Chunker.java
index 4d32664..e393d70 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/Chunker.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/Chunker.java
@@ -23,6 +23,7 @@
 import com.google.common.base.Throwables;
 import com.google.common.io.ByteStreams;
 import com.google.devtools.build.lib.actions.ActionInput;
+import com.google.devtools.build.lib.actions.ActionInputHelper;
 import com.google.devtools.build.lib.actions.cache.VirtualActionInput;
 import com.google.devtools.build.lib.remote.util.DigestUtil;
 import com.google.devtools.build.lib.vfs.Path;
@@ -284,7 +285,7 @@
         inputStream =
             () -> {
               try {
-                return execRoot.getRelative(actionInput.getExecPathString()).getInputStream();
+                return ActionInputHelper.toInputPath(actionInput, execRoot).getInputStream();
               } catch (IOException e) {
                 throw new RuntimeException(e);
               }

src/main/java/com/google/devtools/build/lib/remote/TreeNodeRepository.java

diff --git a/src/main/java/com/google/devtools/build/lib/remote/TreeNodeRepository.java b/src/main/java/com/google/devtools/build/lib/remote/TreeNodeRepository.java
index 1336a3f..547c7ad 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/TreeNodeRepository.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/TreeNodeRepository.java
@@ -340,7 +340,7 @@
       Preconditions.checkArgument(
           inputsStart == inputsEnd - 1, "Encountered two inputs with the same path.");
       ActionInput input = inputs.get(inputsStart);
-      Path leafPath = ActionInputHelper.toPath(input, execRoot);
+      Path leafPath = ActionInputHelper.toInputPath(input, execRoot);
       if (!(input instanceof VirtualActionInput) && uploadSymlinks) {
         FileStatus stat = leafPath.stat(Symlinks.NOFOLLOW);
         if (stat.isSymbolicLink()) {
@@ -405,7 +405,7 @@
           if (uploadSymlinks) {
             // We need to stat the input to check whether it is a symlink.
             // getInputMetadata only gives target metadata.
-            Path inputPath = ActionInputHelper.toPath(input, execRoot);
+            Path inputPath = ActionInputHelper.toInputPath(input, execRoot);
             FileStatus stat = inputPath.stat(Symlinks.NOFOLLOW);
             if (stat.isSymbolicLink()) {
               PathFragment target = inputPath.readSymbolicLink();