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?
Fix event flood by ensuring we do not retry sending the event indefinitely to the Master of Masters. Also the self.delayed dictionary was increasing when it couldn't send the event to the Master of Masters.
What issues does this PR fix or reference?
Fixes #61845
Previous Behavior
When using syndic architecture and running
salt '*' test.ping
we would see a constant event flood where the syndics would continually retry sending the event back to the Master of Masters. This would continue indefinitely until restarting services, even though the Salt Master does indeed eventually get the event, but just needs time to process the events. This backoff ensures we don't continually flood our master of masters indefinitly. This fix alongside adjusting ourreturn_retry_timer
andreturn_retry_timer_max
settings resolved the issue.New Behavior
When running
salt '*' test.ping
we do not see our systems become unusable and the master of masters is able to handle all event returns.Merge requirements satisfied?