Skip to content

Commit cb6581d

Browse files
authored
Cherry-pick #6804 and dependencies to v1.60.x release branch (#6838)
1 parent dd39cdb commit cb6581d

18 files changed

+947
-1449
lines changed

balancer_conn_wrappers.go renamed to balancer_wrapper.go

+115-189
Large diffs are not rendered by default.

balancer_conn_wrappers_test.go renamed to balancer_wrapper_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func (s) TestBalancer_StateListenerBeforeConnect(t *testing.T) {
5555
t.Error("Unexpected call to StateListener with:", scs)
5656
},
5757
})
58-
if err != nil && !strings.Contains(err.Error(), "connection is closing") && !strings.Contains(err.Error(), "is deleted") && !strings.Contains(err.Error(), "is closed or idle") {
58+
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") {
5959
t.Error("Unexpected error creating subconn:", err)
6060
}
6161
wg.Done()

0 commit comments

Comments
 (0)