Skip to content

lazy: Fix data race in TestGoodUpdateThenResolverError #8088

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

Merged
arjan-bal merged 1 commit into from
Feb 17, 2025
Merged

lazy: Fix data race in TestGoodUpdateThenResolverError #8088

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions balancer/lazy/lazy_ext_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import (
"google.golang.org/grpc/connectivity"
"google.golang.org/grpc/credentials/insecure"
"google.golang.org/grpc/internal/balancer/stub"
"google.golang.org/grpc/internal/grpcsync"
"google.golang.org/grpc/internal/grpctest"
"google.golang.org/grpc/internal/stubserver"
"google.golang.org/grpc/internal/testutils"
Expand Down Expand Up @@ -196,14 +197,14 @@ func (s) TestGoodUpdateThenResolverError(t *testing.T) {
backend := stubserver.StartTestService(t, nil)
defer backend.Stop()
resolverStateReceived := false
resolverErrorReceived := false
resolverErrorReceived := grpcsync.NewEvent()

childBF := stub.BalancerFuncs{
Init: func(bd *stub.BalancerData) {
bd.Data = balancer.Get(pickfirstleaf.Name).Build(bd.ClientConn, bd.BuildOptions)
},
UpdateClientConnState: func(bd *stub.BalancerData, ccs balancer.ClientConnState) error {
if resolverErrorReceived {
if resolverErrorReceived.HasFired() {
t.Error("Received resolver error before resolver state.")
}
resolverStateReceived = true
Expand All @@ -213,7 +214,7 @@ func (s) TestGoodUpdateThenResolverError(t *testing.T) {
if !resolverStateReceived {
t.Error("Received resolver error before resolver state.")
}
resolverErrorReceived = true
resolverErrorReceived.Fire()
bd.Data.(balancer.Balancer).ResolverError(err)
},
Close: func(bd *stub.BalancerData) {
Expand Down Expand Up @@ -286,8 +287,10 @@ func (s) TestGoodUpdateThenResolverError(t *testing.T) {
t.Fatalf("Child balancer did not receive resolver state.")
}

if !resolverErrorReceived {
t.Fatalf("Child balancer did not receive error.")
select {
case <-resolverErrorReceived.Done():
case <-ctx.Done():
t.Fatal("Context timed out waiting for resolver error to be delivered to child balancer.")
}
}

Expand Down
Loading