Use wait_for_completion:False instead of relying on timeouts in ForceMerge #2016
Conversation
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
gareth-ellis
changed the title
fressi-elastic
approved these changes
Dec 15, 2025
Contributor
fressi-elastic
left a comment
fressi-elastic
left a comment
There was a problem hiding this comment.
Please have a look to my comments. Overall it LGTM
fressi-elastic
requested changes
Dec 15, 2025
Contributor
fressi-elastic
left a comment
fressi-elastic
left a comment
There was a problem hiding this comment.
Resulting unit test failures looks related. Please fix it.
gbanasiak
reviewed
Dec 15, 2025
gbanasiak
approved these changes
Dec 15, 2025
Contributor
gbanasiak
left a comment
gbanasiak
left a comment
There was a problem hiding this comment.
LGTM.
When run with wait_for_completion=true, force merge returns task ID. This task ID could be used to filter the list of force merge tasks in case there's parallel unrelated force merge running in the cluster. WDYT about adding it as part of this PR?
fressi-elastic
approved these changes
Dec 18, 2025
This was referenced Dec 18, 2025
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.
Relying on a timeout in the force merge runner can result in other errors - e.g if a load balancer kills a connection, typically we would see an SSL related error instead. This change changes polling method to use wait_for_completion:False instead and then polls via the task API.