Skip to content
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

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

Merged
merged 7 commits into from
Dec 7, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2afc15a
buffer & grpcsync: various cleanups and improvements (#6785)
dfawley Nov 15, 2023
4e8bdb7
client: simplify initialization and cleanup a bit (#6798)
dfawley Nov 15, 2023
e68ee03
client: rename balancer and resolver wrapper files to be consistent (…
dfawley Nov 15, 2023
e0445c7
client: remove deprecated WithServiceConfig DialOption (#6800)
dfawley Nov 15, 2023
7e03252
client: further streamlining of Dial (#6802)
dfawley Nov 15, 2023
7fbc125
resolver_wrapper: remove serializerScheduleLocked; the lock is unnece…
dfawley Nov 15, 2023
4357bac
client: rework resolver and balancer wrappers to avoid deadlock (#6804)
dfawley Dec 5, 2023
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
304 changes: 115 additions & 189 deletions balancer_conn_wrappers.go → balancer_wrapper.go
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion balancer_conn_wrappers_test.go → balancer_wrapper_test.go
View file
Open in desktop
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