Skip to content
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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Proxy infinite loop #31846

Merged
merged 2 commits into from Mar 14, 2016
Merged

Proxy infinite loop #31846

merged 2 commits into from Mar 14, 2016

Conversation

cro
Copy link
Contributor

@cro cro commented Mar 12, 2016

What does this PR do?

Corrects a problem where proxies would flood the event bus and cause a pegged CPU when syncing grains.

What issues does this PR fix or reference?

Fixes #31728 and #31791.

Previous Behavior

Syncing grains for proxy would cause a recursive loop (event posted to bus, proxy reacts to event that would post same event to bus, etc)

New Behavior

Grains syncing and custom grains for proxies work without flooding the event bus.

Tests written?

  • Yes
  • No

cachedout pushed a commit that referenced this pull request Mar 14, 2016
@cachedout cachedout merged commit 8268e9b into saltstack:2016.3 Mar 14, 2016
@alexbleotu
Copy link
Contributor

Shouldn't this be merged to develop as well? It is still being hit by the bug

@rallytime
Copy link
Contributor

@alexbleotu Yes, it well be. The current merge-forward to develop is blocked on another issue, but once that is resolved, this PR will be merged into develop.

@alexbleotu
Copy link
Contributor

@rallytime Ok. Thanks!

@meggiebot meggiebot added the bugfix-bckport will be be back-ported to an older release branch by creating a PR against that branch label Mar 15, 2016
@meggiebot
Copy link

Need in 2015.8

@rallytime rallytime added ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch. and removed bugfix-bckport will be be back-ported to an older release branch by creating a PR against that branch labels Mar 15, 2016
cro added a commit that referenced this pull request Mar 15, 2016
@cro cro deleted the proxy_infinite_loop branch May 25, 2017 17:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants