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.

Sign up for GitHub

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

Jump to bottom

fix possible nil before casting #5017

Merged
merged 2 commits into from Dec 1, 2021
Merged

fix possible nil before casting #5017

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
376da7a
fix possible nil before conversion
charlesxsh Nov 30, 2021
83cdccf
fix order of err and v
charlesxsh Nov 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions xds/internal/balancer/clustermanager/clustermanager_test.go
View file
Open in desktop
Expand Up @@ -560,6 +560,9 @@ func TestClusterManagerForwardsBalancerBuildOptions(t *testing.T) {
ctx, cancel := context.WithTimeout(context.Background(), defaultTestTimeout)
defer cancel()
if v, err := ccsCh.Receive(ctx); err != nil {
if v == nil {
Copy link
Member

Choose a reason for hiding this comment

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

Isn't this actually a guarantee here?

I think this is written incorrectly, because it's not actually validating v at all in the normal case (where there is no timeout). Probably what was meant was:

v, err := ccsCh.Receive(ctx)
if err != nil {
	t.Fatalf("timed out waiting for UpdateClientConnState result: %v", err)
}
if v != nil {
	t.Fatal(v)
}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh yes. We need to check err first.

t.Fatalf("received nil")
}
err2 := v.(error)
t.Fatal(err2)
}
Expand Down