commit 163e61f95153cde12f81003222c07c3697280f24
author mschaller <mschaller@google.com> Mon Feb 11 10:01:33 2019 -0800
committer Copybara-Service <copybara-piper@google.com> Mon Feb 11 10:03:53 2019 -0800
tree 5c7e315be5ca43ded9c2589023219011d3965bdb
parent c51d0ee557a0e1f827ed99a0f523f25cd67c0f60

Make action rewinding sensitive to SkyframeAwareActions

SkyframeAwareActions may require additional Skyframe nodes to be rewound,
in addition to their input artifacts and those artifacts' generating
actions.

This CL implements a method on FilesetEntryFunction to help gather these
additional Skyframe nodes for rewinding.

RELNOTES: None.
PiperOrigin-RevId: 233427772

src/main/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunction.java

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunction.java
index 7294a24..3756780 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunction.java
@@ -206,18 +206,44 @@
     return null;
   }
 
+  /**
+   * Returns the {@link RecursiveFilesystemTraversalValue.TraversalRequest} node used to compute the
+   * Skyframe value for {@code filesetEntryKey}. Should only be called to determine which nodes need
+   * to be rewound, and only when {@code filesetEntryKey.isGenerated()}.
+   */
+  public static RecursiveFilesystemTraversalValue.TraversalRequest getDependencyForRewinding(
+      FilesetEntryKey filesetEntryKey) {
+    FilesetTraversalParams t = filesetEntryKey.argument();
+    Preconditions.checkState(
+        t.getDirectTraversal().isPresent() && t.getNestedArtifact() == null,
+        "FilesetEntry does not support nested traversal: %s",
+        t);
+    Preconditions.checkState(
+        t.getDirectTraversal().get().isGenerated(),
+        "Rewinding is only supported for outputs: %s",
+        t);
+    // Traversals in the output tree inline any recursive TraversalRequest evaluations, i.e. there
+    // won't be any transitively depended-on TraversalRequests.
+    return createTraversalRequestKey(createErrorInfo(t), t.getDirectTraversal().get());
+  }
+
+  private static RecursiveFilesystemTraversalValue.TraversalRequest createTraversalRequestKey(
+      String errorInfo, DirectTraversal traversal) {
+    return RecursiveFilesystemTraversalValue.TraversalRequest.create(
+        traversal.getRoot(),
+        traversal.isGenerated(),
+        traversal.getPackageBoundaryMode(),
+        traversal.isStrictFilesetOutput(),
+        traversal.isPackage(),
+        errorInfo);
+  }
+
   private static RecursiveFilesystemTraversalValue traverse(
       Environment env, String errorInfo, DirectTraversal traversal)
       throws MissingDepException, InterruptedException {
-    RecursiveFilesystemTraversalValue.TraversalRequest depKey =
-        RecursiveFilesystemTraversalValue.TraversalRequest.create(
-            traversal.getRoot(),
-            traversal.isGenerated(),
-            traversal.getPackageBoundaryMode(),
-            traversal.isStrictFilesetOutput(),
-            traversal.isPackage(),
-            errorInfo);
-    RecursiveFilesystemTraversalValue v = (RecursiveFilesystemTraversalValue) env.getValue(depKey);
+    RecursiveFilesystemTraversalValue v =
+        (RecursiveFilesystemTraversalValue)
+            env.getValue(createTraversalRequestKey(errorInfo, traversal));
     if (env.valuesMissing()) {
       throw new MissingDepException();
     }