Cherry-pick #6804 and dependencies to v1.60.x release branch (#6838)

grpc · Dec 7, 2023 · cb6581d · cb6581d
1 parent dd39cdb
commit cb6581d
Show file tree

Hide file tree

Showing 18 changed files with 947 additions and 1,449 deletions.
diff --git a/balancer_conn_wrappers.go → balancer_wrapper.go b/balancer_conn_wrappers.go → balancer_wrapper.go
diff --git a/balancer_conn_wrappers_test.go → balancer_wrapper_test.go b/balancer_conn_wrappers_test.go → 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()