Propagate request-task cancellation into the analytics PPL route - #5563
Merged
Swiddis merged 1 commit intoJun 18, 2026
Merged
Conversation
mch2
requested review from
LantaoJin,
RyanL1997,
Swiddis,
acarbonetto,
ahkcs,
anirudha,
dai-chen,
joshuali925,
mengweieric,
noCharger,
penghuo,
ps48,
qianheng-aws,
songkant-aws,
vamsimanohar,
ykmr1224 and
yuancu
as code owners
June 17, 2026 23:30
mengweieric
approved these changes
Jun 17, 2026
mch2
force-pushed
the
fix-analytics-parent-task-cancel
branch
from
June 18, 2026 00:02
9c90dc9 to
3e60ea5
Compare
PPL analytics queries ran detached from the request task, so client disconnects never cancelled them. Dispatch via RestCancellableNodeClient, thread the PPL task through QueryRequestContext on execute/explain (asserted non-null), and pass it from TransportPPLQueryAction. The analytics engine links it as the query-task parent so cancellation cascades to fragments. Signed-off-by: Marc Handalian <marc.handalian@gmail.com>
mch2
force-pushed
the
fix-analytics-parent-task-cancel
branch
from
June 18, 2026 00:04
3e60ea5 to
d2991ca
Compare
Member
Author
yes, needed core change to analytics-api, this is merged and published now. |
Swiddis
approved these changes
Jun 18, 2026
Swiddis
left a comment
Swiddis
left a comment
Collaborator
There was a problem hiding this comment.
doctest passes, ship it
3 tasks
asifabashar
pushed a commit
to asifabashar/sql
that referenced
this pull request
Jul 21, 2026
…nsearch-project#5563) Signed-off-by: Marc Handalian <marc.handalian@gmail.com>
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.
Description
PPL analytics queries ran detached from the request task, so client disconnects never cancelled them. Dispatch via RestCancellableNodeClient, thread the PPL task through QueryRequestContext on execute/explain (asserted non-null), and pass it from TransportPPLQueryAction. The analytics engine links it as the query-task parent so cancellation cascades to fragments.
core PR required before this can be merged - opensearch-project/OpenSearch#22229
Related Issues
Resolves #[Issue number to be closed when this PR is merged]
Check List
--signoffor-s.By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.