client: rework resolver and balancer wrappers to avoid deadlock (#6804)

grpc · Dec 5, 2023 · 5d7453e · 5d7453e
1 parent 93389b7
commit 5d7453e
Show file tree

Hide file tree

Showing 11 changed files with 696 additions and 646 deletions.
diff --git a/balancer_wrapper.go b/balancer_wrapper.go
diff --git a/balancer_wrapper_test.go b/balancer_wrapper_test.go
@@ -55,7 +55,7 @@ func (s) TestBalancer_StateListenerBeforeConnect(t *testing.T) {
 							t.Error("Unexpected call to StateListener with:", scs)
 						},
 					})
-					if err != nil && !strings.Contains(err.Error(), "connection is closing") && !strings.Contains(err.Error(), "is deleted") && !strings.Contains(err.Error(), "is closed or idle") {
+					if err != nil && !strings.Contains(err.Error(), "connection is closing") && !strings.Contains(err.Error(), "is deleted") && !strings.Contains(err.Error(), "is closed or idle") && !strings.Contains(err.Error(), "balancer is being closed") {
 						t.Error("Unexpected error creating subconn:", err)
 					}
 					wg.Done()