Skip to content
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

roachprod: fix nil pointer panic when uploading a key pair #36550

Merged
merged 1 commit into from
Apr 4, 2019

Conversation

ajwerner
Copy link
Contributor

@ajwerner ajwerner commented Apr 4, 2019

In #36488 I sloppily added in a check to deal with races uploading keys which I clearly did not test.

Fixes cause of a skipped AWS test https://teamcity.cockroachdb.com/viewLog.html?tab=buildLog&logTab=tree&filter=debug&expand=all&buildId=1220242&_focus=4713 from last night.

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@ajwerner ajwerner changed the title roachprod: fix nil pointer panic roachprod: fix nil pointer panic when uploading a key pair Apr 4, 2019
@ajwerner ajwerner requested a review from nvanbenschoten April 4, 2019 21:39
Copy link
Member

@nvanbenschoten nvanbenschoten left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, although err == nil || strings.Contains(err.Error(), ... is probably easier to read.

In cockroachdb#36488 I sloppily snuck in a check to deal with races uploading keys
which I clearly did not test.

Release note: None
@ajwerner ajwerner force-pushed the ajwerner/fix-silly-nil-panic branch from 0b921e5 to 2321108 Compare April 4, 2019 21:42
@ajwerner
Copy link
Contributor Author

ajwerner commented Apr 4, 2019

LGTM, although err == nil || strings.Contains(err.Error(), ... is probably easier to read.

Sure, done.

@nvanbenschoten
Copy link
Member

Still LGTM.

@ajwerner
Copy link
Contributor Author

ajwerner commented Apr 4, 2019

bors r+

craig bot pushed a commit that referenced this pull request Apr 4, 2019
36550: roachprod: fix nil pointer panic when uploading a key pair r=ajwerner a=ajwerner

In #36488 I sloppily added in a check to deal with races uploading keys which I clearly did not test.

Fixes cause of a skipped AWS test https://teamcity.cockroachdb.com/viewLog.html?tab=buildLog&logTab=tree&filter=debug&expand=all&buildId=1220242&_focus=4713 from last night. 

Co-authored-by: Andrew Werner <[email protected]>
@craig
Copy link
Contributor

craig bot commented Apr 4, 2019

Build succeeded

@craig craig bot merged commit 2321108 into cockroachdb:master Apr 4, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants