Fix synchronous batch timeout tracking - #70019
Open
bretep wants to merge 1 commit into
Open
Conversation
twangboy
approved these changes
Aug 13, 2026
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.
What does this PR do?
Restricts the shared batch state machine's internal wall-clock timeout sweep to
master-driven asynchronous batches.
The synchronous CLI driver already has an authoritative
LocalClientreturniterator. That iterator probes
saltutil.find_joband stays alive while a jobis running, then reports a timeout through the existing
timed_outinput whentracking ends without a return. Applying a second wall-clock sweep to the CLI
driver releases its slot prematurely and allows the next sub-batch to start
while the original job is still running.
What issues does this PR fix or reference?
Fixes #70018
Previous Behavior
After
timeout + gather_job_timeout, a synchronous batch moved an activeminion to
failedand dispatched another minion even if the return iteratorwas still tracking the running job.
New Behavior
Synchronous batches keep a slot occupied until the return iterator yields the
minion result or exhausts and reports a timeout. Master-driven asynchronous
batches retain their existing internal wall-clock timeout.
Regression tests
a CLI batch slot and that an explicit iterator timeout still can.
Batch.run()test keeps a synthetic return iterator alive beyond thetimeout window and verifies that the next sub-batch is dispatched only after
the first result arrives.
Merge requirements satisfied?
Commits signed with GPG?
No