fix: Retain exception that triggered Dart query cancellation.#19553
Merged
Conversation
In some cases, cancellation is triggered by an exception (rather than a non-exceptional reason, like timeout or user request). This patch retains the exception and includes it in the query report.
FrankChen021
reviewed
Jun 4, 2026
FrankChen021
left a comment
Member
There was a problem hiding this comment.
| Severity | Findings |
|---|---|
| P0 | 0 |
| P1 | 0 |
| P2 | 1 |
| P3 | 0 |
| Total | 1 |
Reviewed 8 of 8 changed files.
Findings that could not be attached inline:
- multi-stage-query/src/main/java/org/apache/druid/msq/exec/ControllerHolder.java:249 - [P2] Preserve cancellation causes before the controller starts. cancel(reason, cause) only records cancelReason while the holder is still ACCEPTED. If the Dart result sequence closes or throws before the run executor starts the controller, the later runAsync path skips controller.stop(...) and builds makeCanceledReport(cancelReason), so the exception passed from DartQueryMaker is dropped and the report is still a bare UNKNOWN cancellation. Store the cause in the holder and use it when building the pre-run canceled report.
This is an automated review by Codex GPT-5.5
capistrant
approved these changes
Jun 4, 2026
capistrant
left a comment
Contributor
There was a problem hiding this comment.
Franks auto review comment looks accurate, but it feels like an improvement that could be a follow if you don't want to work on implementing the idea now
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
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 some cases, cancellation is triggered by an exception (rather than a non-exceptional reason, like timeout or user request). This patch retains the exception and includes it in the query report.