Fix message generation of ActionExecutionException (#18257)

This fixes an issue introduced by commit f95b80d, which resulted in certain exception message being printed twice. Closes #18243. PiperOrigin-RevId: 527848438 Change-Id: Ic0f7a4a0e3bdf07c1c520647dbb4b41d29e05648 Co-authored-by: Fabian Meumertzheim <[email protected]>
bazelbuild · Apr 28, 2023 · 034f646 · 034f646
1 parent 2442a2e
commit 034f646
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 57 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/actions/ActionExecutionException.java b/src/main/java/com/google/devtools/build/lib/actions/ActionExecutionException.java
@@ -57,7 +57,7 @@ public ActionExecutionException(
       ActionAnalysisMetadata action,
       boolean catastrophe,
       DetailedExitCode detailedExitCode) {
-    super(combineMessages(message, cause), cause);
+    super(message, cause);
     this.action = action;
     this.catastrophe = catastrophe;
     this.detailedExitCode = checkNotNull(detailedExitCode);
@@ -96,7 +96,7 @@ public ActionExecutionException(
       NestedSet<Cause> rootCauses,
       boolean catastrophe,
       DetailedExitCode detailedExitCode) {
-    super(combineMessages(message, cause), cause);
+    super(message, cause);
     this.action = action;
     this.rootCauses = rootCauses;
     this.catastrophe = catastrophe;
@@ -203,12 +203,4 @@ public DetailedExitCode getDetailedExitCode() {
   public boolean showError() {
     return getMessage() != null;
   }
-
-  @Nullable
-  private static String combineMessages(String message, @Nullable Throwable cause) {
-    if (cause == null || cause.getMessage() == null) {
-      return message;
-    }
-    return message + ": " + cause.getMessage();
-  }
 }
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeActionExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeActionExecutor.java
@@ -1676,7 +1676,11 @@ private ActionExecutionException toActionExecutionException(
     } else {
       ex = new ActionExecutionException(message, cause, action, false, code);
     }
-    printError(ex.getMessage(), action, actionOutput);
+    String reportMessage = ex.getMessage();
+    if (cause != null && cause.getMessage() != null) {
+      reportMessage += ": " + cause.getMessage();
+    }
+    printError(reportMessage, action, actionOutput);
     return ex;
   }
 

diff --git a/src/test/java/com/google/devtools/build/lib/actions/ActionExecutionExceptionTest.java b/src/test/java/com/google/devtools/build/lib/actions/ActionExecutionExceptionTest.java
diff --git a/src/test/java/com/google/devtools/build/lib/actions/BUILD b/src/test/java/com/google/devtools/build/lib/actions/BUILD
@@ -63,7 +63,6 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils",
         "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils:depsutils",
         "//src/main/java/com/google/devtools/build/lib/util",
-        "//src/main/java/com/google/devtools/build/lib/util:detailed_exit_code",
         "//src/main/java/com/google/devtools/build/lib/util:filetype",
         "//src/main/java/com/google/devtools/build/lib/util:string",
         "//src/main/java/com/google/devtools/build/lib/vfs",