Systemd service no block handling for salt-minion service #68212
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
Modifies systemd_service.{restart,stop} to default to using
no_block=True when the service being stopped or restarted is the
salt-minion.
If you don't pass no_block, the minion blocks waiting for systemd to
restart the service, while systemd is waiting for the minion to exit.
Eventually, after systemd hits its timeout it will kill the salt minion
processes.
Behaviour for other services should remain the same and the functions
will still honour the value of no_block if passed as an argument.
barneysowood
force-pushed
the
systemd-service-no-block-handling
branch
from
e876997 to
79fa9f4
Compare
twangboy
approved these changes
Jul 29, 2025
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?
Modifies
systemd_service.{restart,stop}to default to usingno_block=Truewhen the service being stopped or restarted is the salt-minion.If you don't pass
no_block=True, the minion blocks waiting for systemd to restart the service, while systemd is waiting for the minion to exit. Eventually, after systemd hits its timeout (defaulting to 90secs) it will kill the salt minion processes.Behaviour for other services should remain the same and the functions will still honour the value of
no_blockif passed as an argument.When combined with #68209 this should lead to a much better default behaviour when calling
service.restarton the salt-minion service.Previous Behavior
When calling
service.restartorservice.stopon the salt-minion service, you would have to addno_block=Trueotherwise the salt-minion service and system would deadlock until systemd eventually killed the minion processes.New Behavior
If called on the salt-minion service,
service.restartandservice.stopdefault tono_block=True. For other services, default remainsno_block=FalseMerge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with SSH key?
Yes