Add a LostInputCheck so failed rewindable executions can avoid side effects
It delegates to checking an action filesystem for lost inputs, if such a
filesystem is in use. The check is available in ActionExecutionContext
and SpawnExecutionContext.
Also, this changes the return type of getDepOwners from Collection to
ImmutableSet to more clearly embody its properties: it's unordered and
should have no duplicates.
Action execution involves two failure exception base types, ExecException
and ActionExecutionException. Like before, there remain two "lost inputs"
exception variants, one for each. There was, and is, a way from
converting in one direction, and now there is a way of safely converting
in both directions. {Exec,ActionExecution}Exception probably instead
should be collapsed to one type, but that's a much bigger refactoring
that this avoids.
RELNOTES: None.
PiperOrigin-RevId: 287190381
diff --git a/src/test/java/com/google/devtools/build/lib/actions/ExecutableSymlinkActionTest.java b/src/test/java/com/google/devtools/build/lib/actions/ExecutableSymlinkActionTest.java
index 1ae3dcb..6853c72 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/ExecutableSymlinkActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/ExecutableSymlinkActionTest.java
@@ -19,6 +19,7 @@
import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
import com.google.common.collect.ImmutableMap;
+import com.google.devtools.build.lib.actions.ActionExecutionContext.LostInputsCheck;
import com.google.devtools.build.lib.actions.util.ActionsTestUtil;
import com.google.devtools.build.lib.actions.util.DummyExecutor;
import com.google.devtools.build.lib.analysis.actions.SymlinkAction;
@@ -62,14 +63,15 @@
new SingleBuildFileCache(execRoot.getPathString(), execRoot.getFileSystem()),
ActionInputPrefetcher.NONE,
actionKeyContext,
- null,
+ /*metadataHandler=*/ null,
+ LostInputsCheck.NONE,
outErr,
/*eventHandler=*/ null,
- ImmutableMap.<String, String>of(),
- ImmutableMap.of(),
- null,
- null,
- null);
+ /*clientEnv=*/ ImmutableMap.of(),
+ /*topLevelFilesets=*/ ImmutableMap.of(),
+ /*artifactExpander=*/ null,
+ /*actionFileSystem=*/ null,
+ /*skyframeDepsResult=*/ null);
}
@Test
diff --git a/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java b/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java
index 5ba5c96..f209e37 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/util/ActionsTestUtil.java
@@ -31,6 +31,7 @@
import com.google.devtools.build.lib.actions.Action;
import com.google.devtools.build.lib.actions.ActionAnalysisMetadata;
import com.google.devtools.build.lib.actions.ActionExecutionContext;
+import com.google.devtools.build.lib.actions.ActionExecutionContext.LostInputsCheck;
import com.google.devtools.build.lib.actions.ActionGraph;
import com.google.devtools.build.lib.actions.ActionInput;
import com.google.devtools.build.lib.actions.ActionInputHelper;
@@ -154,10 +155,11 @@
ActionInputPrefetcher.NONE,
actionKeyContext,
metadataHandler,
+ LostInputsCheck.NONE,
fileOutErr,
eventHandler,
ImmutableMap.copyOf(clientEnv),
- ImmutableMap.of(),
+ /*topLevelFilesets=*/ ImmutableMap.of(),
actionGraph == null
? createDummyArtifactExpander()
: ActionInputHelper.actionGraphArtifactExpander(actionGraph),
@@ -169,14 +171,15 @@
DummyExecutor dummyExecutor = new DummyExecutor();
return new ActionExecutionContext(
dummyExecutor,
- null,
+ /*actionInputFileCache=*/ null,
ActionInputPrefetcher.NONE,
new ActionKeyContext(),
- null,
- null,
+ /*metadataHandler=*/ null,
+ LostInputsCheck.NONE,
+ /*fileOutErr=*/ null,
eventHandler,
- ImmutableMap.of(),
- ImmutableMap.of(),
+ /*clientEnv=*/ ImmutableMap.of(),
+ /*topLevelFilesets=*/ ImmutableMap.of(),
createDummyArtifactExpander(),
/*actionFileSystem=*/ null,
/*skyframeDepsResult=*/ null);
@@ -196,6 +199,7 @@
ActionInputPrefetcher.NONE,
actionKeyContext,
metadataHandler,
+ LostInputsCheck.NONE,
fileOutErr,
eventHandler,
ImmutableMap.of(),
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/FileWriteActionTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/FileWriteActionTestCase.java
index e7b0992..5af3cc0 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/actions/FileWriteActionTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/actions/FileWriteActionTestCase.java
@@ -21,6 +21,7 @@
import com.google.common.collect.Sets;
import com.google.devtools.build.lib.actions.Action;
import com.google.devtools.build.lib.actions.ActionExecutionContext;
+import com.google.devtools.build.lib.actions.ActionExecutionContext.LostInputsCheck;
import com.google.devtools.build.lib.actions.ActionInputPrefetcher;
import com.google.devtools.build.lib.actions.ActionOwner;
import com.google.devtools.build.lib.actions.ActionResult;
@@ -64,17 +65,18 @@
context =
new ActionExecutionContext(
executor,
- null,
+ /*actionInputFileCache=*/ null,
ActionInputPrefetcher.NONE,
actionKeyContext,
- null,
+ /*metadataHandler=*/ null,
+ LostInputsCheck.NONE,
new FileOutErr(),
new StoredEventHandler(),
- ImmutableMap.<String, String>of(),
- ImmutableMap.of(),
- null,
- null,
- null);
+ /*clientEnv=*/ ImmutableMap.of(),
+ /*topLevelFilesets=*/ ImmutableMap.of(),
+ /*artifactExpander=*/ null,
+ /*actionFileSystem=*/ null,
+ /*skyframeDepsResult=*/ null);
}
protected void checkNoInputsByDefault() {
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/ParamFileWriteActionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/ParamFileWriteActionTest.java
index b5b0186..aa9047b 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/actions/ParamFileWriteActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/actions/ParamFileWriteActionTest.java
@@ -19,6 +19,7 @@
import com.google.common.collect.ImmutableMap;
import com.google.devtools.build.lib.actions.Action;
import com.google.devtools.build.lib.actions.ActionExecutionContext;
+import com.google.devtools.build.lib.actions.ActionExecutionContext.LostInputsCheck;
import com.google.devtools.build.lib.actions.ActionInputHelper;
import com.google.devtools.build.lib.actions.ActionInputPrefetcher;
import com.google.devtools.build.lib.actions.ActionResult;
@@ -203,14 +204,15 @@
Executor executor = new TestExecutorBuilder(fileSystem, directories, binTools).build();
return new ActionExecutionContext(
executor,
- null,
+ /*actionInputFileCache=*/ null,
ActionInputPrefetcher.NONE,
actionKeyContext,
- null,
+ /*metadataHandler=*/ null,
+ LostInputsCheck.NONE,
new FileOutErr(),
new StoredEventHandler(),
- ImmutableMap.<String, String>of(),
- ImmutableMap.of(),
+ /*clientEnv=*/ ImmutableMap.of(),
+ /*topLevelFilesets=*/ ImmutableMap.of(),
artifactExpander,
/*actionFileSystem=*/ null,
/*skyframeDepsResult=*/ null);
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/SymlinkActionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/SymlinkActionTest.java
index cd81206..f826c30 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/actions/SymlinkActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/actions/SymlinkActionTest.java
@@ -18,6 +18,7 @@
import com.google.common.collect.ImmutableMap;
import com.google.devtools.build.lib.actions.ActionExecutionContext;
+import com.google.devtools.build.lib.actions.ActionExecutionContext.LostInputsCheck;
import com.google.devtools.build.lib.actions.ActionInputPrefetcher;
import com.google.devtools.build.lib.actions.ActionResult;
import com.google.devtools.build.lib.actions.Artifact;
@@ -84,15 +85,16 @@
action.execute(
new ActionExecutionContext(
executor,
- null,
+ /*actionInputFileCache=*/ null,
ActionInputPrefetcher.NONE,
actionKeyContext,
- null,
- null,
+ /*metadataHandler=*/ null,
+ LostInputsCheck.NONE,
+ /*fileOutErr=*/ null,
new StoredEventHandler(),
- ImmutableMap.<String, String>of(),
- ImmutableMap.of(),
- null,
+ /*clientEnv=*/ ImmutableMap.of(),
+ /*topLevelFilesets=*/ ImmutableMap.of(),
+ /*artifactExpander=*/ null,
/*actionFileSystem=*/ null,
/*skyframeDepsResult=*/ null));
assertThat(actionResult.spawnResults()).isEmpty();
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionActionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionActionTest.java
index 58bd02c..2e8e50e 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionActionTest.java
@@ -21,6 +21,7 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.devtools.build.lib.actions.ActionExecutionContext;
+import com.google.devtools.build.lib.actions.ActionExecutionContext.LostInputsCheck;
import com.google.devtools.build.lib.actions.ActionInputPrefetcher;
import com.google.devtools.build.lib.actions.ActionKeyContext;
import com.google.devtools.build.lib.actions.Artifact;
@@ -190,15 +191,16 @@
private ActionExecutionContext createContext(Executor executor) {
return new ActionExecutionContext(
executor,
- null,
+ /*actionInputFileCache=*/ null,
ActionInputPrefetcher.NONE,
actionKeyContext,
- null,
+ /*metadataHandler=*/ null,
+ LostInputsCheck.NONE,
new FileOutErr(),
new StoredEventHandler(),
- ImmutableMap.of(),
- ImmutableMap.of(),
- null,
+ /*clientEnv=*/ ImmutableMap.of(),
+ /*topLevelFilesets=*/ ImmutableMap.of(),
+ /*artifactExpander=*/ null,
/*actionFileSystem=*/ null,
/*skyframeDepsResult=*/ null);
}
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
index 6ded04e..f392669 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
@@ -34,6 +34,7 @@
import com.google.devtools.build.lib.actions.Action;
import com.google.devtools.build.lib.actions.ActionAnalysisMetadata;
import com.google.devtools.build.lib.actions.ActionExecutionContext;
+import com.google.devtools.build.lib.actions.ActionExecutionContext.LostInputsCheck;
import com.google.devtools.build.lib.actions.ActionGraph;
import com.google.devtools.build.lib.actions.ActionInput;
import com.google.devtools.build.lib.actions.ActionKeyContext;
@@ -2241,10 +2242,11 @@
/*actionInputPrefetcher=*/ null,
actionKeyContext,
/*metadataHandler=*/ null,
+ LostInputsCheck.NONE,
actionLogBufferPathGenerator.generate(ArtifactPathResolver.IDENTITY),
reporter,
clientEnv,
- ImmutableMap.of(),
+ /*topLevelFilesets=*/ ImmutableMap.of(),
artifactExpander,
/*actionFileSystem=*/ null,
/*skyframeDepsResult*/ null);
diff --git a/src/test/java/com/google/devtools/build/lib/exec/StandaloneTestStrategyTest.java b/src/test/java/com/google/devtools/build/lib/exec/StandaloneTestStrategyTest.java
index f866227..7c05c80 100644
--- a/src/test/java/com/google/devtools/build/lib/exec/StandaloneTestStrategyTest.java
+++ b/src/test/java/com/google/devtools/build/lib/exec/StandaloneTestStrategyTest.java
@@ -95,18 +95,19 @@
public FakeActionExecutionContext(
FileOutErr fileOutErr, SpawnActionContext spawnActionContext) {
super(
- /* executor= */ null,
- /* actionInputFileCache= */ null,
+ /*executor=*/ null,
+ /*actionInputFileCache=*/ null,
ActionInputPrefetcher.NONE,
new ActionKeyContext(),
- /* metadataHandler= */ null,
+ /*metadataHandler=*/ null,
+ LostInputsCheck.NONE,
fileOutErr,
/*eventHandler=*/ null,
- /* clientEnv= */ ImmutableMap.of(),
- /* topLevelFilesets= */ ImmutableMap.of(),
- /* artifactExpander= */ null,
- /* actionFileSystem= */ null,
- /* skyframeDepsResult= */ null);
+ /*clientEnv=*/ ImmutableMap.of(),
+ /*topLevelFilesets=*/ ImmutableMap.of(),
+ /*artifactExpander=*/ null,
+ /*actionFileSystem=*/ null,
+ /*skyframeDepsResult=*/ null);
this.spawnActionContext = spawnActionContext;
}
diff --git a/src/test/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunnerTest.java b/src/test/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunnerTest.java
index d4daedf..1033ab8 100644
--- a/src/test/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunnerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunnerTest.java
@@ -276,6 +276,9 @@
public MetadataInjector getMetadataInjector() {
throw new UnsupportedOperationException();
}
+
+ @Override
+ public void checkForLostInputs() {}
}
private final MetadataProvider mockFileCache = mock(MetadataProvider.class);
diff --git a/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnCacheTest.java b/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnCacheTest.java
index 733ac65..5c93a05 100644
--- a/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnCacheTest.java
+++ b/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnCacheTest.java
@@ -204,6 +204,9 @@
}
};
}
+
+ @Override
+ public void checkForLostInputs() {}
};
private static SimpleSpawn simpleSpawnWithExecutionInfo(
diff --git a/src/test/java/com/google/devtools/build/lib/remote/util/FakeSpawnExecutionContext.java b/src/test/java/com/google/devtools/build/lib/remote/util/FakeSpawnExecutionContext.java
index 82e43ab..aa6ed7b 100644
--- a/src/test/java/com/google/devtools/build/lib/remote/util/FakeSpawnExecutionContext.java
+++ b/src/test/java/com/google/devtools/build/lib/remote/util/FakeSpawnExecutionContext.java
@@ -144,4 +144,7 @@
}
};
}
+
+ @Override
+ public void checkForLostInputs() {}
}
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CreateIncSymlinkActionTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CreateIncSymlinkActionTest.java
index 5cde05f..98d2f4e 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CreateIncSymlinkActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CreateIncSymlinkActionTest.java
@@ -19,6 +19,7 @@
import com.google.common.collect.ImmutableMap;
import com.google.devtools.build.lib.actions.ActionExecutionContext;
+import com.google.devtools.build.lib.actions.ActionExecutionContext.LostInputsCheck;
import com.google.devtools.build.lib.actions.ActionKeyContext;
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.actions.ArtifactRoot;
@@ -122,6 +123,7 @@
/*actionInputPrefetcher=*/ null,
/*actionKeyContext=*/ null,
/*metadataHandler=*/ null,
+ LostInputsCheck.NONE,
/*fileOutErr=*/ null,
new StoredEventHandler(),
/*clientEnv=*/ ImmutableMap.of(),
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/LtoBackendActionTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/LtoBackendActionTest.java
index 4604523..8545a43 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/LtoBackendActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/LtoBackendActionTest.java
@@ -20,6 +20,7 @@
import com.google.devtools.build.lib.actions.AbstractAction;
import com.google.devtools.build.lib.actions.Action;
import com.google.devtools.build.lib.actions.ActionExecutionContext;
+import com.google.devtools.build.lib.actions.ActionExecutionContext.LostInputsCheck;
import com.google.devtools.build.lib.actions.ActionInputPrefetcher;
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.actions.Executor;
@@ -90,6 +91,7 @@
ActionInputPrefetcher.NONE,
actionKeyContext,
/*metadataHandler=*/ null,
+ LostInputsCheck.NONE,
new FileOutErr(),
new StoredEventHandler(),
/*clientEnv=*/ ImmutableMap.of(),
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java
index e89c793..87bfa7f 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java
@@ -26,6 +26,7 @@
import com.google.devtools.build.lib.actions.Action;
import com.google.devtools.build.lib.actions.ActionAnalysisMetadata;
import com.google.devtools.build.lib.actions.ActionExecutionContext;
+import com.google.devtools.build.lib.actions.ActionExecutionContext.LostInputsCheck;
import com.google.devtools.build.lib.actions.ActionInputHelper;
import com.google.devtools.build.lib.actions.ActionInputPrefetcher;
import com.google.devtools.build.lib.actions.ActionTemplate.ActionTemplateExpansionException;
@@ -788,18 +789,19 @@
ActionExecutionContext dummyActionExecutionContext =
new ActionExecutionContext(
- null,
- null,
+ /*executor=*/ null,
+ /*actionInputFileCache=*/ null,
ActionInputPrefetcher.NONE,
actionKeyContext,
- null,
- null,
- null,
- ImmutableMap.<String, String>of(),
- ImmutableMap.of(),
+ /*metadataHandler=*/ null,
+ LostInputsCheck.NONE,
+ /*fileOutErr=*/ null,
+ /*eventHandler=*/ null,
+ /*clientEnv=*/ ImmutableMap.of(),
+ /*topLevelFilesets=*/ ImmutableMap.of(),
DUMMY_ARTIFACT_EXPANDER,
- null,
- null);
+ /*actionFileSystem=*/ null,
+ /*skyframeDepsResult=*/ null);
ByteArrayOutputStream moduleMapStream = new ByteArrayOutputStream();
ByteArrayOutputStream umbrellaHeaderStream = new ByteArrayOutputStream();
moduleMapAction.newDeterministicWriter(dummyActionExecutionContext)
@@ -841,18 +843,19 @@
ActionExecutionContext dummyActionExecutionContext =
new ActionExecutionContext(
- null,
- null,
+ /*executor=*/ null,
+ /*actionInputFileCache=*/ null,
ActionInputPrefetcher.NONE,
actionKeyContext,
- null,
- null,
- null,
- ImmutableMap.of(),
- ImmutableMap.of(),
+ /*metadataHandler=*/ null,
+ LostInputsCheck.NONE,
+ /*fileOutErr=*/ null,
+ /*eventHandler=*/ null,
+ /*clientEnv=*/ ImmutableMap.of(),
+ /*topLevelFilesets=*/ ImmutableMap.of(),
DUMMY_ARTIFACT_EXPANDER,
- null,
- null);
+ /*actionFileSystem=*/ null,
+ /*skyframeDepsResult=*/ null);
ByteArrayOutputStream moduleMapStream = new ByteArrayOutputStream();
ByteArrayOutputStream umbrellaHeaderStream = new ByteArrayOutputStream();
diff --git a/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java b/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java
index 7c9ddc9..1a0ce10 100644
--- a/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java
+++ b/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java
@@ -22,6 +22,7 @@
import com.google.common.collect.Sets;
import com.google.common.eventbus.EventBus;
import com.google.devtools.build.lib.actions.ActionExecutionContext;
+import com.google.devtools.build.lib.actions.ActionExecutionContext.LostInputsCheck;
import com.google.devtools.build.lib.actions.ActionInputPrefetcher;
import com.google.devtools.build.lib.actions.ActionKeyContext;
import com.google.devtools.build.lib.actions.Artifact;
@@ -190,6 +191,7 @@
ActionInputPrefetcher.NONE,
new ActionKeyContext(),
/*metadataHandler=*/ null,
+ LostInputsCheck.NONE,
outErr,
reporter,
/*clientEnv=*/ ImmutableMap.of(),
