detect running from master in State.event method #34256
Merged
Conversation
This file contains 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
This changes `State.event` to detect whether the state that invoked `fire_event` is running on the master. This fixes an issue where the `fire_event` requisite doesn't work when being used in orchestration states.
| @@ -1936,7 +1936,13 @@ def event(self, chunk_ret, length, fire_event=False): | |||
| chunk is evaluated an event will be set up to the master with the | |||
| results. | |||
| ''' | |||
| if not self.opts.get('local') and (self.opts.get('state_events', True) or fire_event) and self.opts.get('master_uri'): | |||
| if not self.opts.get('local') and (self.opts.get('state_events', True) or fire_event): | |||
There was a problem hiding this comment.
I'm somewhat doubtful that this and the following conditions are sufficient for determining whether the state is being applied on the master or the minion. I'm looking for insight on whether this is a good change or not.
There was a problem hiding this comment.
I think this approach will work.
|
@tmehlinger This looks good to me. Just some minor lint issues for you to fix up and then I'll get this in. https://jenkins.saltstack.com/job/PR/job/salt-pr-lint-n/2849/violations/file/salt/state.py/ |
cachedout
added
the
Pending-Discussion
|
Linting issues resolved! Any chance this would make it into the next release? It would help me a ton. |
cachedout
added
the
bugfix-bckport
|
Go Go Jenkins! |
|
@tmehlinger I marked it as a backport for you. Thanks! |
rallytime
added
ZZZ[Done]-back-ported-bf
rallytime
pushed a commit
that referenced
this pull request
Jun 28, 2016
* detect running from master in State.event method This changes `State.event` to detect whether the state that invoked `fire_event` is running on the master. This fixes an issue where the `fire_event` requisite doesn't work when being used in orchestration states. * fix linting issues
gitebra
pushed a commit
to gitebra/salt
that referenced
this pull request
Jun 29, 2016
* upstream/develop: (44 commits) Send traps to Zabbix when there is a comment and name in result. Fix invalid syntax error in system.py module exception handling Don't forget the pylint disables for range Back-port saltstack#34256 to 2016.3 (saltstack#34343) Pylint fixes Revert py3modernize lint changes (saltstack#34339) Add listen/listen_in support to stateconf.py Change merge-if-exists logic to properly report changes Doc clarifications to file modules, addition of new `profile` log level to docs, fixed example in dnsmasq (saltstack#34323) version checking had a logical error (saltstack#34333) fix saltstack#34329 (saltstack#34330) Remove unnecessarily-disabled sanity check (saltstack#34325) Do not force 'filter' table when flushing add osmajorrelease to ubuntu and fix pylint Fix psutil.cpu_times unpack error (saltstack#34318) Typo in dockerio doc (saltstack#34319) add osmajorrelease grain for raspbian [2016.3] Update to latest bootstrap script v2016.06.27 [2015.8] Update to latest bootstrap script v2016.06.27 [2015.5] Update to latest bootstrap script v2016.06.27 ...
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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?
Fixes (I hope)
State.eventto work correctly when running on the master. This will enable firing events using thefire_eventrequisite in orchestration states.I've tested this with the test case I provided on #34255 and it works as I expect; it produces the following event:
What issues does this PR fix or reference?
#34255
Previous Behavior
fire_eventrequisite did not work with orchestration.New Behavior
fire_eventrequisite works with orchestration. Does not appear to utterly destroy everything else that depends onState.fire_event.Tests written?
No -- looking for guidance.
Please review Salt's Contributing Guide for best practices.
This changes
State.eventto detect whether the state that invokedfire_eventis running on the master. This fixes an issue where thefire_eventrequisite doesn't work when being used in orchestration states.