Skip to content

Commit

Permalink
Revert "Report remote execution messages as events"
Browse files Browse the repository at this point in the history
Since it makes it harder for BEP consumers to present the messages in a structured way.

Fixes bazelbuild#19327.

This reverts commit 6d089b3.
  • Loading branch information
coeuvre committed Aug 28, 2023
1 parent 8c191d8 commit 056fbc8
Showing 1 changed file with 10 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
import com.google.devtools.build.lib.server.FailureDetails;
import com.google.devtools.build.lib.server.FailureDetails.FailureDetail;
import com.google.devtools.build.lib.util.ExitCode;
import com.google.devtools.build.lib.util.io.FileOutErr;
import com.google.devtools.build.lib.vfs.Path;
import com.google.devtools.build.lib.vfs.PathFragment;
import com.google.longrunning.Operation;
Expand Down Expand Up @@ -289,7 +290,7 @@ public SpawnResult exec(Spawn spawn, SpawnExecutionContext context)
// It's already late at this stage, but we should at least report once.
reporter.reportExecutingIfNot();

maybePrintExecutionMessages(spawn, result.getMessage(), result.success());
maybePrintExecutionMessages(context, result.getMessage(), result.success());

profileAccounting(result.getExecutionMetadata());
spawnMetricsAccounting(spawnMetrics, result.getExecutionMetadata());
Expand Down Expand Up @@ -460,16 +461,14 @@ public boolean handlesCaching() {
return true;
}

private void maybePrintExecutionMessages(Spawn spawn, String message, boolean success) {
private void maybePrintExecutionMessages(
SpawnExecutionContext context, String message, boolean success) {
FileOutErr outErr = context.getFileOutErr();
boolean printMessage =
remoteOptions.remotePrintExecutionMessages.shouldPrintMessages(success)
&& !message.isEmpty();
if (printMessage) {
report(
Event.info(
String.format(
"Remote execution message for %s %s: %s",
spawn.getMnemonic(), spawn.getTargetLabel(), message)));
outErr.printErr(message + "\n");
}
}

Expand Down Expand Up @@ -528,10 +527,11 @@ private SpawnResult execLocallyAndUploadOrFail(
if (remoteOptions.remoteLocalFallback && !RemoteRetrierUtils.causedByExecTimeout(cause)) {
return execLocallyAndUpload(action, spawn, context, uploadLocalResults);
}
return handleError(action, cause);
return handleError(action, cause, context);
}

private SpawnResult handleError(RemoteAction action, IOException exception)
private SpawnResult handleError(RemoteAction action, IOException exception,
SpwnExecutionContext context)
throws ExecException, InterruptedException, IOException {
boolean remoteCacheFailed = BulkTransferException.allCausedByCacheNotFoundException(exception);
if (exception.getCause() instanceof ExecutionStatusException) {
Expand All @@ -551,7 +551,7 @@ private SpawnResult handleError(RemoteAction action, IOException exception)
}
if (e.isExecutionTimeout()) {
maybePrintExecutionMessages(
action.getSpawn(), e.getResponse().getMessage(), /* success= */ false);
context, e.getResponse().getMessage(), /* success= */ false);
SpawnResult.Builder resultBuilder =
new SpawnResult.Builder()
.setRunnerName(getName())
Expand Down

0 comments on commit 056fbc8

Please sign in to comment.