Revert "[7.3.0] Deduplicate locally executed path mapped spawns (baze…

…lbuild#23069)" This reverts commit ffe1df5. Causes race conditions, see bazelbuild#23288 for details.
fmeum · Aug 13, 2024 · 371fbf6 · 371fbf6
1 parent d89b97d
commit 371fbf6
Show file tree

Hide file tree

Showing 12 changed files with 152 additions and 929 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/actions/SpawnResult.java b/src/main/java/com/google/devtools/build/lib/actions/SpawnResult.java
@@ -488,149 +488,6 @@ public Digest getDigest() {
     }
   }
 
-  /**
-   * A helper class for wrapping an existing {@link SpawnResult} and modifying a subset of its
-   * methods.
-   */
-  class DelegateSpawnResult implements SpawnResult {
-    private final SpawnResult delegate;
-
-    public DelegateSpawnResult(SpawnResult delegate) {
-      this.delegate = delegate;
-    }
-
-    @Override
-    public boolean setupSuccess() {
-      return delegate.setupSuccess();
-    }
-
-    @Override
-    public boolean isCatastrophe() {
-      return delegate.isCatastrophe();
-    }
-
-    @Override
-    public Status status() {
-      return delegate.status();
-    }
-
-    @Override
-    public int exitCode() {
-      return delegate.exitCode();
-    }
-
-    @Override
-    @Nullable
-    public FailureDetail failureDetail() {
-      return delegate.failureDetail();
-    }
-
-    @Override
-    @Nullable
-    public String getExecutorHostName() {
-      return delegate.getExecutorHostName();
-    }
-
-    @Override
-    public String getRunnerName() {
-      return delegate.getRunnerName();
-    }
-
-    @Override
-    public String getRunnerSubtype() {
-      return delegate.getRunnerSubtype();
-    }
-
-    @Override
-    @Nullable
-    public Instant getStartTime() {
-      return delegate.getStartTime();
-    }
-
-    @Override
-    public int getWallTimeInMs() {
-      return delegate.getWallTimeInMs();
-    }
-
-    @Override
-    public int getUserTimeInMs() {
-      return delegate.getUserTimeInMs();
-    }
-
-    @Override
-    public int getSystemTimeInMs() {
-      return delegate.getSystemTimeInMs();
-    }
-
-    @Override
-    @Nullable
-    public Long getNumBlockOutputOperations() {
-      return delegate.getNumBlockOutputOperations();
-    }
-
-    @Override
-    @Nullable
-    public Long getNumBlockInputOperations() {
-      return delegate.getNumBlockInputOperations();
-    }
-
-    @Override
-    @Nullable
-    public Long getNumInvoluntaryContextSwitches() {
-      return delegate.getNumInvoluntaryContextSwitches();
-    }
-
-    @Override
-    @Nullable
-    public Long getMemoryInKb() {
-      return delegate.getMemoryInKb();
-    }
-
-    @Override
-    public SpawnMetrics getMetrics() {
-      return delegate.getMetrics();
-    }
-
-    @Override
-    public boolean isCacheHit() {
-      return delegate.isCacheHit();
-    }
-
-    @Override
-    public String getFailureMessage() {
-      return delegate.getFailureMessage();
-    }
-
-    @Override
-    @Nullable
-    public InputStream getInMemoryOutput(ActionInput output) {
-      return delegate.getInMemoryOutput(output);
-    }
-
-    @Override
-    public String getDetailMessage(
-        String message, boolean catastrophe, boolean forciblyRunRemotely) {
-      return delegate.getDetailMessage(message, catastrophe, forciblyRunRemotely);
-    }
-
-    @Override
-    @Nullable
-    public MetadataLog getActionMetadataLog() {
-      return delegate.getActionMetadataLog();
-    }
-
-    @Override
-    public boolean wasRemote() {
-      return delegate.wasRemote();
-    }
-
-    @Override
-    @Nullable
-    public Digest getDigest() {
-      return delegate.getDigest();
-    }
-  }
-
   /** Builder class for {@link SpawnResult}. */
   final class Builder {
     private int exitCode;

diff --git a/src/main/java/com/google/devtools/build/lib/exec/AbstractSpawnStrategy.java b/src/main/java/com/google/devtools/build/lib/exec/AbstractSpawnStrategy.java
@@ -221,7 +221,7 @@ public ImmutableList<SpawnResult> exec(
               ? resultMessage
               : CommandFailureUtils.describeCommandFailure(
                   executionOptions.verboseFailures, cwd, spawn);
-      throw new SpawnExecException(message, spawnResult, /* forciblyRunRemotely= */ false);
+      throw new SpawnExecException(message, spawnResult, /*forciblyRunRemotely=*/ false);
     }
     return ImmutableList.of(spawnResult);
   }

diff --git a/src/main/java/com/google/devtools/build/lib/exec/BUILD b/src/main/java/com/google/devtools/build/lib/exec/BUILD
@@ -225,7 +225,6 @@ java_library(
     deps = [
         ":spawn_runner",
         "//src/main/java/com/google/devtools/build/lib/actions",
-        "//src/main/java/com/google/devtools/build/lib/profiler",
     ],
 )
 

diff --git a/src/main/java/com/google/devtools/build/lib/exec/SpawnCache.java b/src/main/java/com/google/devtools/build/lib/exec/SpawnCache.java
@@ -18,7 +18,6 @@
 import com.google.devtools.build.lib.actions.ForbiddenActionInputException;
 import com.google.devtools.build.lib.actions.Spawn;
 import com.google.devtools.build.lib.actions.SpawnResult;
-import com.google.devtools.build.lib.actions.Spawns;
 import com.google.devtools.build.lib.exec.SpawnRunner.SpawnExecutionContext;
 import java.io.Closeable;
 import java.io.IOException;