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

Jump to bottom

client: fix leaked addrConn struct when addresses are updated #4347

Merged
merged 2 commits into from Apr 22, 2021
Merged

client: fix leaked addrConn struct when addresses are updated #4347

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae236e3
[addrconn_update_address_leak] client: fix leaked addrConn struct whe…
menghanl Apr 20, 2021
1931e1d
[addrconn_update_address_leak] update comment
menghanl Apr 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions balancer_conn_wrappers.go
View file
Open in desktop
Expand Up @@ -205,7 +205,7 @@ func (acbw *acBalancerWrapper) UpdateAddresses(addrs []resolver.Address) {
acbw.mu.Lock()
defer acbw.mu.Unlock()
if len(addrs) <= 0 {
acbw.ac.tearDown(errConnDrain)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should tearDown itself handle this case?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It feels weird to me for addrConn to grab parent ClientConn's mu, and change ClientConn's fields directly (we do that for some of the keepalive configs today though).

I updated comment of tearDown, to direct callers to use cc.removeAddrConn() instead.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That seems fine, I think it was a bad suggestion anyway for other reasons.

acbw.ac.cc.removeAddrConn(acbw.ac, errConnDrain)
return
}
if !acbw.ac.tryUpdateAddrs(addrs) {
Expand All @@ -220,7 +220,7 @@ func (acbw *acBalancerWrapper) UpdateAddresses(addrs []resolver.Address) {
acbw.ac.acbw = nil
acbw.ac.mu.Unlock()
acState := acbw.ac.getState()
acbw.ac.tearDown(errConnDrain)
acbw.ac.cc.removeAddrConn(acbw.ac, errConnDrain)

if acState == connectivity.Shutdown {
return
Expand Down