[ES|QL] Do not skip a remote cluster base on the query's execution time status#138332
Merged
fang-xing-esql merged 15 commits intoelastic:mainfrom Dec 4, 2025
Merged
Conversation
Collaborator
|
Hi @fang-xing-esql, I've created a changelog YAML for you. |
Collaborator
|
Pinging @elastic/es-analytical-engine (Team:Analytics) |
Member
Author
|
The two failed release tests happen on main as well, they are not introduced by this PR. |
This was referenced Nov 25, 2025
ioanatia
approved these changes
Dec 1, 2025
Contributor
ioanatia
left a comment
There was a problem hiding this comment.
looks good! is the next step to enable the multi cluster tests running with snapshot builds for FORK and views?
Member
Author
Thank you for reviewing @ioanatia ! Yes, the next step is to enable |
This was referenced Dec 10, 2025
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.
This PR attempts to prevent a
forkorsubquerybranch from being skipped on a remote cluster when the query's execution status is changed(toSUCCESSFULorPARTIALfor example) at execution time, and makes sure the results are collected from all branches executed in parallel. It does not correct the execution status or metrics collected onforkorsubquery.This PR is a prerequisite for enabling CCS tests for
forkandsubquery(#137776). Without this change, the results of these CCS tests can be non-deterministic because some branches may be skipped unexpectedly, and cause incorrect query results. This fix can either be merged together with #137776 or submitted by itself. This change is behind snapshot and is applied to branches fromforkandsubqueryonly, so that the CCS tests forforkandsubquerycan return consistent and correct results. The existing CCS tests for queries withoutforkorsubquerybranches should pass.We might need new data structure to support collecting correct execution status and metrics for
forkandsubquery, and it will be addressed in a separate PR.