Destroy MinionManager event resources deterministically - #70179
Open
twangboy wants to merge 2 commits into
Open
Conversation
The minion logged loud "unclosed publish server", "unclosed SyncWrapper", and "unclosed publisher client" WARNING messages after losing its master connection with no working failover. Root cause was two gaps in MinionManager's teardown: - MinionManager.destroy() never closed event_publisher/event; only stop_async() (the SIGTERM path) did. - cli/daemons.py's Minion.start() never called shutdown()/destroy() when _real_start() raised SaltClientError because self.minion.restart was True -- it just returned, leaving event_publisher/event to be reclaimed only by __del__'s GC-time safety net. - salt/minion.py: MinionManager.destroy() now also closes event_publisher and destroys event, mirroring stop_async(). - salt/cli/daemons.py: Minion.start() now destroys the MinionManager on SaltClientError, both before retrying (daemonized multi-master failover) and before falling through to the final break/return. Fixes saltstack#70175
pre-commit's pinned black (24.2.0) wraps these with/patch.object chains differently than a newer local black run had produced. Fixes the "Pre-Commit / Run Pre-Commit Against Salt" CI failure on PR saltstack#70179.
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?
The minion logged loud "unclosed publish server", "unclosed SyncWrapper", and "unclosed publisher client" WARNING messages after losing its master connection with no working failover. Root cause was two gaps in MinionManager's teardown:
MinionManager.destroy()never closedevent_publisher/event; onlystop_async()(the SIGTERM path) did.cli/daemons.py'sMinion.start()never calledshutdown()/destroy()when_real_start()raisedSaltClientErrorbecauseself.minion.restartwasTrue-- it just returned, leavingevent_publisher/eventto be reclaimed only by__del__'s GC-time safety net.salt/minion.py:MinionManager.destroy()now also closesevent_publisherand destroysevent, mirroringstop_async().salt/cli/daemons.py:Minion.start()now destroys theMinionManageronSaltClientError, both before retrying (daemonized multi-master failover) and before falling through to the finalbreak/return.What issues does this PR fix or reference?
Fixes #70175
Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
Yes