Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

grpcproxy: fix deadlock on watch broadcasts stop

Browse Source 
Holding the WatchBroadcasts lock and waiting on donec was
causing a deadlock with the coalesce loop. Was causing
TestV3WatchSyncCancel to hang.
This commit is contained in:
Anthony Romano 2016-11-18 16:55:26 -08:00
parent 377f19b003
commit 7618fdd1d6
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
proxy/grpcproxy/watch_broadcasts.go
View File

@ -116,13 +116,12 @@ func (wbs *watchBroadcasts) empty() bool { return len(wbs.bcasts) == 0 }
func (wbs *watchBroadcasts) stop() { func (wbs *watchBroadcasts) stop() {
wbs.mu.Lock() wbs.mu.Lock()
defer wbs.mu.Unlock()
for wb := range wbs.bcasts { for wb := range wbs.bcasts {
wb.stop() wb.stop()
} }
wbs.bcasts = nil wbs.bcasts = nil
close(wbs.updatec) close(wbs.updatec)
wbs.mu.Unlock()
<-wbs.donec <-wbs.donec
} }