Remove redundant describe()-like parameters from ExecException#toActionExecutionException.
The remaining ones insert the label, which otherwise doesn't get printed, but obviously should be.
This is more clean-up work before changing how these error messages look in general. Shouldn't be any major differences in output.
#11151
PiperOrigin-RevId: 336893371
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/coverage/CoverageReportActionBuilder.java b/src/main/java/com/google/devtools/build/lib/bazel/coverage/CoverageReportActionBuilder.java
index 10665d2..597a86a 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/coverage/CoverageReportActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/coverage/CoverageReportActionBuilder.java
@@ -147,9 +147,7 @@
actionExecutionContext.getEventHandler().handle(Event.info(locationMessage));
return ActionResult.create(spawnResults);
} catch (ExecException e) {
- throw e.toActionExecutionException(
- "Coverage report generation failed: ",
- this);
+ throw e.toActionExecutionException(this);
}
}
@@ -159,6 +157,11 @@
}
@Override
+ protected String getRawProgressMessage() {
+ return "Coverage report generation";
+ }
+
+ @Override
protected void computeKey(
ActionKeyContext actionKeyContext,
@Nullable ArtifactExpander artifactExpander,
diff --git a/src/main/java/com/google/devtools/build/lib/exec/SymlinkTreeStrategy.java b/src/main/java/com/google/devtools/build/lib/exec/SymlinkTreeStrategy.java
index f4603b7..de90cc6 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/SymlinkTreeStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/exec/SymlinkTreeStrategy.java
@@ -136,7 +136,7 @@
actionExecutionContext.getFileOutErr());
}
} catch (ExecException e) {
- throw e.toActionExecutionException(action.getProgressMessage(), action);
+ throw e.toActionExecutionException(action);
}
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java
index 431fd63..39a322c 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java
@@ -1923,9 +1923,7 @@
} catch (IOException e) {
throw new EnvironmentalExecException(
e, createFailureDetail("OutErr copy failure", Code.COPY_OUT_ERR_FAILURE))
- .toActionExecutionException(
- getRawProgressMessage(),
- CppCompileAction.this);
+ .toActionExecutionException(CppCompileAction.this);
}
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java
index 13d92ad..03f8349 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java
@@ -543,11 +543,6 @@
return null;
}
- private ActionExecutionException toActionExecutionException(ExecException e) {
- String failMessage = getRawProgressMessage();
- return e.toActionExecutionException(failMessage, this);
- }
-
/** Reads the {@code .jdeps} output from the given spawn results. */
private Deps.Dependencies readOutputDepsProto(
List<SpawnResult> results, ActionExecutionContext actionExecutionContext)
@@ -560,9 +555,9 @@
: inMemoryOutput) {
return Deps.Dependencies.parseFrom(input);
} catch (IOException e) {
- throw toActionExecutionException(
- new EnvironmentalExecException(
- e, createFailureDetail(".jdeps read IOException", Code.JDEPS_READ_IO_EXCEPTION)));
+ throw new EnvironmentalExecException(
+ e, createFailureDetail(".jdeps read IOException", Code.JDEPS_READ_IO_EXCEPTION))
+ .toActionExecutionException(this);
}
}
@@ -628,12 +623,12 @@
try {
deleteOutputs(actionExecutionContext.getExecRoot(), /* bulkDeleter= */ null);
} catch (IOException e) {
- throw toActionExecutionException(
- new EnvironmentalExecException(
+ throw new EnvironmentalExecException(
e,
createFailureDetail(
"Failed to delete reduced action outputs",
- Code.REDUCED_CLASSPATH_FALLBACK_CLEANUP_FAILURE)));
+ Code.REDUCED_CLASSPATH_FALLBACK_CLEANUP_FAILURE))
+ .toActionExecutionException(JavaCompileAction.this);
}
actionExecutionContext.getMetadataHandler().resetOutputs(getOutputs());
Spawn spawn;
@@ -650,7 +645,7 @@
return new JavaFallbackActionContinuation(
actionExecutionContext, results, fallbackContinuation);
} catch (ExecException e) {
- throw toActionExecutionException(e);
+ throw e.toActionExecutionException(JavaCompileAction.this);
}
}
}
@@ -694,7 +689,7 @@
ActionResult.create(
ImmutableList.copyOf(Iterables.concat(primaryResults, fallbackResults))));
} catch (ExecException e) {
- throw toActionExecutionException(e);
+ throw e.toActionExecutionException(JavaCompileAction.this);
}
}
}
