Bugfix/68573 multiprocessing wait importerror#68722
Draft
harshang03 wants to merge 6 commits intosaltstack:masterfrom
Draft
Bugfix/68573 multiprocessing wait importerror#68722harshang03 wants to merge 6 commits intosaltstack:masterfrom
harshang03 wants to merge 6 commits intosaltstack:masterfrom
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
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?
Prevents Salt master/minion shutdown paths from crashing when multiprocessing.Process.join() triggers an ImportError due to partially-initialized stdlib modules (notably multiprocessing.connection.wait) during signal-handling / teardown re-entrancy. Adds a safer child-reaping path that falls back to non-blocking exitcode polling.
What issues does this PR fix or reference?
Fixes #68573
Previous Behavior
During shutdown (SIGTERM) on some systems, the master could log an unhandled exception like:
ImportError: cannot import name 'wait' from partially initialized module 'multiprocessing.connection'
originating from Process.join() while killing children.
New Behavior
Shutdown no longer fails due to this ImportError. Child cleanup is best-effort and robust: kill_children() tolerates join-time ImportErrors and reaps via exitcode polling instead.
Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
No