Prohibit --rewind_lost_inputs in Skymeld mode.

justinhorvitz · copybara-github · commit 0e1b3e2d40b4 · 2023-10-16T10:12:02.000-07:00
Supporting this combination of features wouldn't be too hard - as far as I know, we'd just have to set up the `GraphInconsistencyReceiver` properly. However, we don't intend to run these features together yet, so might as well prohibit it until we need it.

PiperOrigin-RevId: 573849045
Change-Id: I8bc91b9c5fa57b89b605fbe175755e945feb9e81
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java
@@ -312,7 +312,7 @@ private GraphInconsistencyReceiver getGraphInconsistencyReceiverForCommand(
     return GraphInconsistencyReceiver.THROWING;
   }
 
-  private static boolean rewindingEnabled(OptionsProvider options) throws AbruptExitException {
+  private boolean rewindingEnabled(OptionsProvider options) throws AbruptExitException {
     var buildRequestOptions = options.getOptions(BuildRequestOptions.class);
     if (buildRequestOptions == null || !buildRequestOptions.rewindLostInputs) {
       return false;
@@ -327,6 +327,18 @@ private static boolean rewindingEnabled(OptionsProvider options) throws AbruptEx
                           .setCode(ActionRewinding.Code.REWIND_LOST_INPUTS_PREREQ_UNMET))
                   .build()));
     }
+    if (isMergedSkyframeAnalysisExecution()) {
+      throw new AbruptExitException(
+          DetailedExitCode.of(
+              FailureDetail.newBuilder()
+                  .setMessage(
+                      "--rewind_lost_inputs is not compatible with Skymeld"
+                          + " (--experimental_merged_skyframe_analysis_execution)")
+                  .setActionRewinding(
+                      ActionRewinding.newBuilder()
+                          .setCode(ActionRewinding.Code.REWIND_LOST_INPUTS_PREREQ_UNMET))
+                  .build()));
+    }
     return true;
   }
 
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutorTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutorTest.java
@@ -2664,10 +2664,16 @@ public NestedSet<Artifact> discoverInputs(ActionExecutionContext actionExecution
 
   @Test
   public void rewindingPrerequisites(
-      @TestParameter boolean trackIncrementalState, @TestParameter boolean useActionCache)
+      @TestParameter boolean trackIncrementalState,
+      @TestParameter boolean useActionCache,
+      @TestParameter boolean skymeldEnabled)
       throws Exception {
     initializeSkyframeExecutor();
-    options.parse("--rewind_lost_inputs", "--use_action_cache=" + useActionCache);
+    options.parse(
+        "--rewind_lost_inputs",
+        "--use_action_cache=" + useActionCache,
+        "--experimental_merged_skyframe_analysis_execution=" + skymeldEnabled);
+    skyframeExecutor.setMergedSkyframeAnalysisExecutionSupplier(() -> skymeldEnabled);
 
     skyframeExecutor.setActive(false);
     skyframeExecutor.decideKeepIncrementalState(
@@ -2679,7 +2685,7 @@ public void rewindingPrerequisites(
         reporter);
     skyframeExecutor.setActive(true);
 
-    if (useActionCache) {
+    if (useActionCache || skymeldEnabled) {
       AbruptExitException e = assertThrows(AbruptExitException.class, this::syncSkyframeExecutor);
       assertThat(e.getDetailedExitCode().getFailureDetail().getActionRewinding().getCode())
           .isEqualTo(ActionRewinding.Code.REWIND_LOST_INPUTS_PREREQ_UNMET);
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/rewinding/RewindingTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/rewinding/RewindingTest.java
@@ -72,6 +72,7 @@ protected void setupOptions() throws Exception {
     addOptions(
         "--spawn_strategy=standalone",
         "--nouse_action_cache",
+        "--noexperimental_merged_skyframe_analysis_execution",
         "--rewind_lost_inputs",
         "--features=cc_include_scanning",
         "--experimental_remote_include_extraction_size_threshold=0",
