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

Prevent currentThread().join() on cli thread crash #22122

Closed
wants to merge 1 commit into from
Closed

Prevent currentThread().join() on cli thread crash #22122

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/main/java/com/google/devtools/build/lib/runtime/UiEventHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -981,11 +981,15 @@ private void startUpdateThread() {
* Stop the update thread and wait for it to terminate. As the update thread, which is a separate
* thread, might have to call a synchronized method between being interrupted and terminating, DO
* NOT CALL from a SYNCHRONIZED block, as this will give the opportunity for dead locks.
*
* If this is called from the updateThread itself, ignore the interrupt/join, as it is hopefully
* handling a FATAL, and should be terminating anyway.
*/
private void stopUpdateThread() {
shutdown = true;
Thread threadToWaitFor = updateThread.getAndSet(null);
if (threadToWaitFor != null) {
// we could be second to wait here, or be the current thread, which would hang
if (threadToWaitFor != null && threadToWaitFor != Thread.currentThread()) {
threadToWaitFor.interrupt();
Uninterruptibles.joinUninterruptibly(threadToWaitFor);
}
Expand Down