- Notifications
You must be signed in to change notification settings - Fork5.6k
Fix beacons not sent when beacon_refresh called#68549
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Open
Ch3LL wants to merge1 commit intosaltstack:3006.xChoose a base branch
base:3006.x
Could not load branches
Branch not found:{{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
+52 −3
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
salt/minion.py Outdated
Comment on lines 2610 to 2611
| self.beacons=salt.beacons.Beacon(self.opts,self.functions) | ||
| self.beacons.interval_map=old_interval_map |
Contributor
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
I recommend updating the Beacon init to accept an interval map and pass it in instead of setting the variable afterwards. i.e. something like
def__init__(self,opts,functions,interval_map=None):importsalt.loaderself.opts=optsself.functions=functionsself.beacons=salt.loader.beacons(opts,functions)self.interval_map=interval_mapor {}
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Labels
None yet
2 participants
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 issues does this PR fix or reference?
Fixes:#68548
Previous Behavior
The interval_map would get re-set to 0 whenever we called beacons_refresh. If beacons_refresh is continually getting called for example when running a state run then the beacons would never get sent.
New Behavior
interval_map is preserved if set and the beacon still gets sent when running a state run (or any other situation that refreshes beacon)