Use single JID for entire batch run#68941
Merged
dwoz merged 2 commits intosaltstack:masterfrom Apr 16, 2026
Merged
Conversation
Batch mode previously generated a separate JID per batch iteration, making it impossible to track a batch operation as a single job via salt-run jobs.lookup_jid. Generate one JID at the start of batch.run() and pass it to every cmd_iter_no_block call so all iterations share it. In local_cache.save_minions(), change from overwrite to read-merge-write so that each batch iteration accumulates its minion list under the shared JID rather than replacing the previous iteration's list. In client.cmd_iter_no_block(), filter the jid kwarg before passing to get_iter_returns to avoid conflicting with its positional jid argument. Fixes saltstack#25362, saltstack#58502
dwoz
changed the title
twangboy
approved these changes
Apr 16, 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
2 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.
Batch mode previously generated a separate JID per batch iteration, making it impossible to track a batch operation as a single job via salt-run jobs.lookup_jid. Generate one JID at the start of batch.run() and pass it to every cmd_iter_no_block call so all iterations share it.
In local_cache.save_minions(), change from overwrite to read-merge-write so that each batch iteration accumulates its minion list under the shared JID rather than replacing the previous iteration's list.
In client.cmd_iter_no_block(), filter the jid kwarg before passing to get_iter_returns to avoid conflicting with its positional jid argument.
Fixes #25362, #58502