Pass all data to batch.run() call when using --failhard #33048
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
gitebra
pushed a commit
to gitebra/salt
that referenced
this pull request
May 10, 2016
* upstream/develop: (77 commits) Add list_values to reg module (saltstack#33120) Make sure new csf module docs are included in build (saltstack#33126) * Improve init script: specifically manage salt configurations rather than arbitrary salt processes (saltstack#32666) Join domain with new name (saltstack#32988) Fix functionality of unless in states.cmd, when unless condition given as a list (saltstack#33026) Fix override of ec2 volumetype (saltstack#33115) Pylint Take the develop version of glusterfs.py state Add a check that the cmdline of the found proc matches (saltstack#33101) Changed NAPALM output (saltstack#33095) Develop 2016 0509 0030 (saltstack#33111) Remove poorly written test (saltstack#33124) Add Support for CSF (saltstack#33117) Add PyYAML with CLoader (saltstack#33079) fix tests for file.blockplace to remove newline (saltstack#33082) Catch IOLoop RuntimeError on CLI exit (saltstack#33070) Disable pylint warning for unused imports Add fun_args to scheduled return data (part of saltstack#24237) (saltstack#33039) Don't append a newline when creating new content with blockreplace (saltstack#33049) Pass all data to batch.run() call when using --failhard (saltstack#33048) ...
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?
Passes more data to batch.run when specifying
--failhard. This allows salt.py to look for the function's retcode and stop the batch run when using--failhard.What issues does this PR fix or reference?
Fixes #24996
Previous Behavior
Without this change, cmd_run worked as expected (because the retcode is passed automatically), but when using cmd.run, the failhard was honored and the batch run would continue instead of exiting:
New Behavior
With this change, the retcode of the failed cmd.run command is recognized at the process exits:
Tests written?
No