Repository navigation
[2.0] fix(search): honor a reindex stop that lands before the job starts (#35183) - #35186
Merged
Merged
Conversation
Contributor
✅ PR checks passedThe linked issue has a description and all required Shipping project fields set. Thanks! |
Code Review ✅ Approved🟡 Medium risk · Propagating early stop signals and releasing the reindex lock could prematurely halt indexing if a stop is observed during job setup. Fixes the Search Indexing app so a stop requested in the first seconds of a run is honored at each hand-off in the orchestrator, strategy, and executor chain, instead of being lost and leaving the run stuck in Running. No issues found. OptionsDisplay: compact → Counting what did not apply, without listing it. Comment with these commands to change the behavior for this request:
Was this helpful? React with 👍 / 👎 | Powered by Gitar — free for open source |
harshach
approved these changes
Oct 10, 2026
This branch was successfully deployed
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.
Fixes #35182
Backport of PR #35183 to 2.0, in its smaller form.
Problem
Stopping the Search Indexing app in the first seconds of a run did not stop it. The reindex still ran, and the run could stay Running for good. In Collate, Admin Ops then refuses every new reindex with a 409 while the app looks busy.
Why it happened
A run is built as a chain: orchestrator, then strategy, then executor, then the distributed job. A stop only reached the pieces that already existed. A stop that arrived while a piece was still being created was lost for that piece and everything after it. When it was lost at the executor, the job was started with nobody working on it, another server adopted it and indexed everything, and nothing ever closed the run.
What this PR changes
Each piece now passes on a stop that arrived before it created the next one:
On
main, PR #35183 goes one step further and gives the whole run one shared stop signal instead of these hand-offs. 2.0 gets this smaller version because it is a patch line: the change stays inside three classes and keeps every constructor as it is.How it was tested
main, the same change made Collate'sAdminOpsApiITpass where it failed like Collate CI, with the stop forced into both windows.