Bugfix: Prevent continuous restart, if a dependency wasn't installed #35339
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
| @@ -81,14 +81,14 @@ def suicide_when_without_parent(parent_pid): | |||
| try: | |||
| minion = salt.cli.daemons.Minion() | |||
| minion.start() | |||
| except (ImportError, SystemExit) as exc: | |||
| log.error(exc) | |||
There was a problem hiding this comment.
We no longer want to set the restart flag to False here if we hit a SystemExit?
There was a problem hiding this comment.
@cachedout it is already False. We do not want set it to True. 😉
There was a problem hiding this comment.
Ah, I didn't read up enough. I do like it being explicit but you're right. Thanks!
cachedout
added
the
Pending-Discussion
|
@cachedout This is not my lint problem, as this code is already there. Should I extra-fix this in this PR? |
|
I think it's complaining because L86 is now an ancestor to what you added on L84, so yes, this was caused by your change. If you could please clean it up then we'll get this in. Thanks. :] |
isbm
force-pushed
the
isbm-2015.8-minion-importerror-fix
branch
from
590ff2c
to
12af60b
Compare
|
@cachedout here you go. 😉 |
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?
Maintenance bugfix.
What issues does this PR fix or reference?
Prevents minion restart forever if a dependency module wasn't installed by a various reasons.
Tests written?
No