rpc: correctly check for nil before cast #100296
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
|
It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR? 🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf. |
|
This change is |
erikgrinaker
approved these changes
Mar 31, 2023
ajwerner
reviewed
Mar 31, 2023
| @@ -2715,13 +2715,14 @@ func (rpcCtx *Context) loadOrCreateConnAttempt( | |||
| select { | |||
| case <-previousAttempt.initialHeartbeatDone: | |||
| // The connection attempt was completed, return the outcome of it. | |||
| err := previousAttempt.err.Load().(error) | |||
There was a problem hiding this comment.
slight preference for just changing this to err, _ := previousAttempt.err.Load().(error), but only slight. This could still panic if somehow err.Load() had a non-nil, non-error value
As part of the fix of cockroachdb#99104, a cast without a nil check was introduced. This PR addresses that by only casting if it is known to be not nil. Epic: none Fixes: cockroachdb#100275 Release note: None
andrewbaptist
force-pushed
the
2023-03-30-fix-error
branch
from
2cdcd4f to
46feb6b
Compare
|
bors r=ajwerner |
|
Build succeeded: |
|
does this need to be backported? |
|
It's included in #100238, the backport of the original change. |
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.
As part of the fix of #99104, a cast without a nil check was introduced. This PR addresses that by only casting if it is known to be not nil.
Epic: none
Fixes: #100275
Release note: None