perf: Interrupt controllers when canceling them.#19233
Merged
gianm merged 8 commits intoapache:masterfrom Apr 3, 2026
Merged
Conversation
In PRs apache#18095 and apache#18931, worker cancellation was switched to use interrupts with a lightweight non-interrupt-based failsafe. This patch implements a similar idea for controllers, to aid in more prompt cancellation in cases where the controller is blocking on something. The main change is to track the controller thread in ControllerHolder and interrupt it on cancel(), in addition to calling controller.stop(). ControllerHolder is also moved from dart.controller to msq.exec, since it is now a shared class, no longer Dart-specific. In addition, the "workerOffline" logic is moved to Dart's ControllerMessageListener, since that really is Dart-specific.
github-actions
Bot
added
Area - Batch Ingestion
Area - MSQ
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| return; | ||
| } | ||
|
|
||
| switch (report.getStatus().getStatus()) { |
Check warning
Code scanning / CodeQL
Missing enum case in switch Warning
clintropolis
approved these changes
Apr 2, 2026
Comment on lines
+154
to
+155
| final ListeningExecutorService exec, | ||
| final ScheduledExecutorService scheduledExec |
Member
There was a problem hiding this comment.
any chance we will need any other kinds of pools available? like wondering if we should we just pass the whole ControllerThreadPool in here instead of the 2 execs, or will callers not always have a ControllerThreadPool?
Contributor
Author
There was a problem hiding this comment.
The MSQControllerTask doesn't have a ControllerThreadPool, but it could make one. I suppose might as well change this to ControllerThreadPool. I'll do that.
gianm
added a commit
to gianm/druid
that referenced
this pull request
Apr 16, 2026
In apache#19233 controllers were updated to be canceled using a combination of stop + direct thread interrupt. This patch makes worker cancellation work the same way. The change is necessary to fix a problem where the worker context could be closed before the worker finishes running, since the worker context is closed using a listener on the run future. To ensure proper sequencing, the run future must not be directly cancellable, since that would cause the listener to fire too early.
gianm
added a commit
that referenced
this pull request
Apr 17, 2026
In #19233 controllers were updated to be canceled using a combination of stop + direct thread interrupt. This patch makes worker cancellation work the same way. The change is necessary to fix a problem where the worker context could be closed before the worker finishes running, since the worker context is closed using a listener on the run future. To ensure proper sequencing, the run future must not be directly cancelable, since that would cause the listener to fire too early.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
In PRs #18095 and #18931, worker cancellation was switched to use interrupts with a lightweight non-interrupt-based failsafe. This patch implements a similar idea for controllers, to aid in more prompt cancellation in cases where the controller is blocking on something.
The main change is to track the controller thread in
ControllerHolderand interrupt it oncancel(), in addition to callingcontroller.stop(). ControllerHolder is also moved fromdart.controllertomsq.exec, since it is now a shared class, no longer Dart-specific. In addition, theworkerOfflinelogic is moved to Dart'sControllerMessageListener, since that really is Dart-specific.