Skip to content

Commit

Permalink
[6.4.0] Revert "Report remote execution messages as events" (#19415)
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 #19327.

This reverts commit 6d089b3.

Closes #19347.

Commit
d3d167f

PiperOrigin-RevId: 562793125
Change-Id: I6ea41323c4ea98d416e4cfd9728d0d753aef9b5e

Co-authored-by: Chi Wang <chiwang@google.com>
  • Loading branch information
iancha1992 and coeuvre authored Sep 6, 2023
1 parent ad813e2 commit 4eb2ba6
Showing 1 changed file with 7 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,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 @@ -288,7 +289,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 @@ -459,16 +460,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 @@ -550,8 +549,7 @@ private SpawnResult handleError(
}
}
if (e.isExecutionTimeout()) {
maybePrintExecutionMessages(
action.getSpawn(), e.getResponse().getMessage(), /* success= */ false);
maybePrintExecutionMessages(context, e.getResponse().getMessage(), /* success= */ false);
return new SpawnResult.Builder()
.setRunnerName(getName())
.setStatus(Status.TIMEOUT)
Expand Down

0 comments on commit 4eb2ba6

Please sign in to comment.