Skip to content

MSQ: Include stageId, workerNumber in processing thread names. #17324

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

Merged
gianm merged 2 commits into from
Oct 11, 2024
Merged

MSQ: Include stageId, workerNumber in processing thread names. #17324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e9175b
MSQ: Include stageId, workerNumber in processing thread names.
gianm Oct 10, 2024
7166a74
s/dart/msq/
gianm Oct 11, 2024
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
3 changes: 2 additions & 1 deletion extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -969,10 +969,11 @@ private StageOutputHolder getOrCreateStageOutputHolder(final StageId stageId, fi

/**
* Returns cancellation ID for a particular stage, to be used in {@link FrameProcessorExecutor#cancel(String)}.
* In addition to being a token for cancellation, this also appears in thread dumps, so make it a little descriptive.
*/
private static String cancellationIdFor(final StageId stageId, final int workerNumber)
{
return StringUtils.format("%s_%s", stageId, workerNumber);
return StringUtils.format("msq-worker[%s_%s]", stageId, workerNumber);
}

/**
Expand Down
9 changes: 9 additions & 0 deletions processing/src/main/java/org/apache/druid/frame/processor/FrameProcessorExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ private Optional<ReturnOrAwait<T>> runProcessorNow()
}
}

final String threadName = Thread.currentThread().getName();
boolean canceled = false;
Either<Throwable, ReturnOrAwait<T>> retVal;

Expand All @@ -230,6 +231,11 @@ private Optional<ReturnOrAwait<T>> runProcessorNow()
throw new InterruptedException();
}

if (cancellationId != null) {
// Set the thread name to something involving the cancellationId, to make thread dumps more useful.
Thread.currentThread().setName(threadName + "-" + cancellationId);
}

retVal = Either.value(processor.runIncrementally(readableInputs));
}
catch (Throwable e) {
Expand All @@ -253,6 +259,9 @@ private Optional<ReturnOrAwait<T>> runProcessorNow()
canceled = true;
}
}

// Restore original thread name.
Thread.currentThread().setName(threadName);
}
}

Expand Down