Open
Conversation
Use filelock to serialize queue checks and validate PIDs in state_queue files to prevent race conditions and handle stale locks during state.apply(queue=True).
- Replace blocking `while` loop in `state.apply(queue=True)` with a non-blocking queue-and-return model to prevent connection timeouts. - Implement `process_state_queue` in the Minion `periodic_callbacks` to asynchronously execute queued jobs. - Use `filelock` to synchronize access to the queue directory (`cachedir/state_queue`) and prevent race inversions. - Serialize job payloads to disk (`queued_<timestamp>_<jid>.p`) to ensure strict FIFO ordering and persistence. - Fix "Invisible Gap" race condition by reserving a process slot before execution. - Update `_prior_running_states` to respect both currently running jobs and queued jobs. - Handle local execution (`salt-call`) scenarios where `__pub_jid` is missing. - Add `filelock` to `salt.utils.thin` to support the queue lock in thin/remote environments. - Add `test_state_queue.py` integration test to verify queuing behavior and execution order.
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
1 participant
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?
What issues does this PR fix or reference?
Fixes
Previous Behavior
Remove this section if not relevant
New Behavior
Remove this section if not relevant
Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
Yes/No