Make salt-client aware of edge-case where saltutil might be broken #35446
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
| except KeyError as exc: | ||
| # This is a safe pass. We're just using the try/except to avoid having to deep-check for keys | ||
| log.debug('Passing on saltutil error. This may be an error in saltclient. {0}'.format(exc)) | ||
| pass |
There was a problem hiding this comment.
pass is not needed here, I guess
There was a problem hiding this comment.
Whoops. Forgot to remove that from when I was debugging. Thanks.
rallytime
added
the
pending-changes
cachedout
removed
the
pending-changes
gitebra
pushed a commit
to gitebra/salt
that referenced
this pull request
Aug 17, 2016
* upstream/develop: (25 commits) Remove "env" keword arg references from cp module functions Update blockdev references to 'disk' in blockdev state unit test Add docs for pillar_raise_on_missing option Update blockdev state to use disk execution module instead of blockdev Add blockdev.py module back in to develop. Remove the env and activate kwargs from pip install/ed functions Update bootstrap script to latest stable (2016.08.16) (saltstack#35486) Make salt-client aware of edge-case where saltutil might be broken (saltstack#35446) Fixup SSH bug where sudo without sudo user would break Fix silly error win_pkg: Fix traceback when package is not installed fix clrf commit fix add a test to check existing functionality is broken fixes saltstack#34279 [2015.8] Update bootstrap script to latest stable (2016.08.15) (saltstack#35460) Some environments refuse to return the command output Fix Unit test for suppressing the exception removal on non-modified repos Remove zypper's raise exception if mod_repo has no arguments and/or no changes Add ignore_repo_failure option to suppress zypper's exit code 106 on unavailable repos ...
|
@cachedout This causes error logging when there is no retcode in I had to obtain that by launching a debugger when the exception was triggered. This particular case happened while I was running the Are we simply missing a |
|
Ah, K. Apologies for the headache there. I think we should just refine this to only enter the block if a retcode is present. I'll make the change if you concur. |
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.
Closes #34161