Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[6.3.0] Report remote execution messages as events #18780

Merged
merged 2 commits into from
Jun 27, 2023
Merged

[6.3.0] Report remote execution messages as events #18780

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d76ccc6
Report remote execution messages as events
illicitonion Jun 26, 2023
6b8d615
Merge branch 'release-6.3.0' into cp18757
iancha1992 Jun 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@
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 @@ -274,7 +273,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(context, result.getMessage(), result.success());
maybePrintExecutionMessages(spawn, result.getMessage(), result.success());

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

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

Expand Down Expand Up @@ -534,7 +535,8 @@ private SpawnResult handleError(
}
}
if (e.isExecutionTimeout()) {
maybePrintExecutionMessages(context, e.getResponse().getMessage(), /* success = */ false);
maybePrintExecutionMessages(
action.getSpawn(), e.getResponse().getMessage(), /* success= */ false);
return new SpawnResult.Builder()
.setRunnerName(getName())
.setStatus(Status.TIMEOUT)
Expand Down