-
Notifications
You must be signed in to change notification settings - Fork 292
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
nuke: Avoid a TypeError w/ null node description #1883
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -245,11 +245,11 @@ def nuke(ctx, should_unlock, sync_clocks=True, noipmi=False, keep_logs=False, sh | |
with parallel() as p: | ||
for target, hostkey in ctx.config['targets'].items(): | ||
status = get_status(target) | ||
if ctx.name and ctx.name not in status.get('description', ""): | ||
if ctx.name and ctx.name not in (status.get('description') or ""): | ||
total_unnuked[target] = hostkey | ||
log.info( | ||
f"Not nuking {target} because description doesn't match: " | ||
f"{ctx.name} != {status['description']}" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This seems like the actual fix for the exception There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If you visit the Sentry event I linked in the commit message you can see that the error is on line 248 |
||
f"{ctx.name} != {status.get('description')}" | ||
) | ||
continue | ||
elif status.get('up') is False: | ||
|
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does this change accomplish anything? name won't be in "" and that's a valid test, right? (in fact, couldn't it just be status.get('description'), since the default is None and name won't be in that either?)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The bug is that we end up trying to iterate over
None
. This happens whenstatus['description']
has the valueNone
.dict.get
works in such a way that the second arg is returned if there is no value for the requested key, as opposed to there being a Falsey value. So your example would have us hitting the error ifstatus['description']
wereNone
or""
.