commit af061f844eb134d379733f120f1d1ee96000cdd1
author Googler <noreply@google.com> Tue Apr 19 09:34:30 2022 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Apr 19 09:35:48 2022 -0700
tree b411592a93dcee70a478183fce090134c4616e70
parent aa2a1f3afe2f10baab5befcafb39df14cbffc743

Print the Java class and self-described action key inputs on action conflicts.

This extra output helped debug some failures during Starlarkification: it
showed that a Java and Starlark action were interacting (providing a clear lead
on which actions registrations were involved), and clearly showed that the
difference was the argv of their invocations (which identified what the actual
difference between them was).

PiperOrigin-RevId: 442833250

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

diff --git a/src/main/java/com/google/devtools/build/lib/actions/MutableActionGraph.java b/src/main/java/com/google/devtools/build/lib/actions/MutableActionGraph.java
index 9941307..b56e540 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/MutableActionGraph.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/MutableActionGraph.java
@@ -34,9 +34,7 @@
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 
-/**
- * A mutable action graph. Implementations of this interface must be thread-safe.
- */
+/** A mutable action graph. Implementations of this interface must be thread-safe. */
 public interface MutableActionGraph extends ActionGraph {
 
   /**
@@ -78,9 +76,7 @@
       super(
           String.format(
               "for %s, previous action: %s, attempted action: %s",
-              artifact.prettyPrint(),
-              previousAction.prettyPrint(),
-              attemptedAction.prettyPrint()));
+              artifact.prettyPrint(), previousAction.prettyPrint(), attemptedAction.prettyPrint()));
       this.artifact = artifact;
       this.suffix = debugSuffix(actionKeyContext, attemptedAction, previousAction);
     }
@@ -190,15 +186,29 @@
       boolean aNull = aOwner == null;
       boolean bNull = bOwner == null;
 
-      addStringDetail(sb, "Label", aNull ? null : Label.print(aOwner.getLabel()),
+      addStringDetail(
+          sb,
+          "Label",
+          aNull ? null : Label.print(aOwner.getLabel()),
           bNull ? null : Label.print(bOwner.getLabel()));
       if ((!aNull && !aOwner.getAspectDescriptors().isEmpty())
           || (!bNull && !bOwner.getAspectDescriptors().isEmpty())) {
         addStringDetail(sb, "Aspects", aspectDescriptor(aOwner), aspectDescriptor(bOwner));
       }
-      addStringDetail(sb, "RuleClass", aNull ? null : aOwner.getTargetKind(),
+      addStringDetail(
+          sb,
+          "RuleClass",
+          aNull ? null : aOwner.getTargetKind(),
           bNull ? null : bOwner.getTargetKind());
-      addStringDetail(sb, "Configuration", aNull ? null : aOwner.getConfigurationChecksum(),
+      addStringDetail(
+          sb,
+          "JavaActionClass",
+          aNull ? null : a.getClass().toString(),
+          bNull ? null : b.getClass().toString());
+      addStringDetail(
+          sb,
+          "Configuration",
+          aNull ? null : aOwner.getConfigurationChecksum(),
           bNull ? null : bOwner.getConfigurationChecksum());
       addStringDetail(sb, "Mnemonic", a.getMnemonic(), b.getMnemonic());
       try {
@@ -219,6 +229,11 @@
             "Progress message",
             ((ActionExecutionMetadata) a).getProgressMessage(),
             ((ActionExecutionMetadata) b).getProgressMessage());
+        addStringDetail(
+            sb,
+            "Action describeKey",
+            ((ActionExecutionMetadata) a).describeKey(),
+            ((ActionExecutionMetadata) b).describeKey());
       }
 
       Artifact aPrimaryInput = a.getPrimaryInput();