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

[7.4.0] Replace "checking cached actions" message when no action is running. #23357

Merged
merged 1 commit into from
Aug 21, 2024
Merged

[7.4.0] Replace "checking cached actions" message when no action is running. #23357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions src/main/java/com/google/devtools/build/lib/buildtool/ExecutionProgressReceiver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,4 +243,8 @@ public void maybeReportInactivity() {
}
};
}

public boolean hasActionsInFlight() {
return completedActions.size() < exclusiveTestsCount + enqueuedActions.size();
}
}
6 changes: 5 additions & 1 deletion src/main/java/com/google/devtools/build/lib/runtime/UiStateTracker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1246,7 +1246,11 @@ protected void writeExecutionProgress(
ActionState oldestAction = getOldestAction();
if (actionsCount == 0 || oldestAction == null) {
// TODO(b/239693084): Improve the message here.
terminalWriter.normal().append(" checking cached actions");
if (executionProgressReceiver != null && executionProgressReceiver.hasActionsInFlight()) {
terminalWriter.normal().append(" checking cached actions");
} else {
terminalWriter.normal().append(" no actions running");
}
maybeShowRecentTest(terminalWriter, shortVersion, targetWidth - terminalWriter.getPosition());
} else if (actionsCount == 1) {
if (maybeShowRecentTest(null, shortVersion, targetWidth - terminalWriter.getPosition())) {
Expand Down
Loading