Skip to content

internal: fix deadlock during switch_balancer and NewSubConn() #4536

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

Merged
dfawley merged 2 commits into from
Jun 11, 2021
Merged

internal: fix deadlock during switch_balancer and NewSubConn() #4536

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62b7bd8
[switch_no_lock] internal: dont hold cc.mu while switching balancer
menghanl Jun 10, 2021
9b0462a
[switch_no_lock] sync all resolver incoming calls
menghanl Jun 11, 2021
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
5 changes: 5 additions & 0 deletions clientconn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,12 @@ func (cc *ClientConn) switchBalancer(name string) {
return
}
if cc.balancerWrapper != nil {
// Don't hold cc.mu while closing the balancers. The balancers may call
// methods that require cc.mu (e.g. cc.NewSubConn()). Holding the mutex
// would cause a deadlock in that case.
cc.mu.Unlock()
cc.balancerWrapper.close()
cc.mu.Lock()
}

builder := balancer.Get(name)
Expand Down