Fix beacon delete not closing beacon modules#68898
Open
dwoz wants to merge 1 commit intosaltstack:3007.xfrom
Open
Fix beacon delete not closing beacon modules#68898dwoz wants to merge 1 commit intosaltstack:3007.xfrom
dwoz wants to merge 1 commit intosaltstack:3007.xfrom
Conversation
When beacons.delete is called, the beacon is removed from opts but the beacon module's close() function is never called. This leaves resources like inotify file descriptors and notifier threads active, causing CPU spin that never recovers. Add _close_beacon() and close_beacons() methods to the Beacon class. Call _close_beacon() from delete_beacon() before removing the beacon from opts, and call close_beacons() from Minion.beacons_refresh() before replacing the Beacon instance. Fixes saltstack#66449
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.
When beacons.delete is called, the beacon is removed from opts but the beacon module's close() function is never called. This leaves resources like inotify file descriptors and notifier threads active, causing CPU spin that never recovers.
Add _close_beacon() and close_beacons() methods to the Beacon class. Call _close_beacon() from delete_beacon() before removing the beacon from opts, and call close_beacons() from Minion.beacons_refresh() before replacing the Beacon instance.
Fixes #66449
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