Skip to content

Commit

Permalink
Cherry-pick #6804 and dependencies to v1.60.x release branch (#6838)
Browse files Browse the repository at this point in the history
  • Loading branch information
dfawley authored Dec 7, 2023
1 parent dd39cdb commit cb6581d
Show file tree
Hide file tree
Showing 18 changed files with 947 additions and 1,449 deletions.
304 changes: 115 additions & 189 deletions balancer_conn_wrappers.go → balancer_wrapper.go

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Loading

0 comments on commit cb6581d

Please sign in to comment.