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 in watchbroadcast

Browse Source 
Calling empty() in watchbroadcast methods was trying to
lock the rwmutex when it was already held.

Fixes #6937
This commit is contained in:
Anthony Romano 2016-12-05 14:10:17 -08:00
parent 2509e7ad2c
commit 91ff6f30b5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
proxy/grpcproxy/watch_broadcast.go
View File

@ -89,8 +89,8 @@ func (wb *watchBroadcast) bcast(wr clientv3.WatchResponse) {
for r := range wb.receivers { for r := range wb.receivers {
r.send(wr) r.send(wr)
} }
if wb.size() > 0 { if len(wb.receivers) > 0 {
eventsCoalescing.Add(float64(wb.size() - 1)) eventsCoalescing.Add(float64(len(wb.receivers) - 1))
} }
} }
@ -135,7 +135,7 @@ func (wb *watchBroadcast) delete(w *watcher) {
panic("deleting missing watcher from broadcast") panic("deleting missing watcher from broadcast")
} }
delete(wb.receivers, w) delete(wb.receivers, w)
if !wb.empty() { if len(wb.receivers) > 0 {
// do not dec the only left watcher for coalescing. // do not dec the only left watcher for coalescing.
watchersCoalescing.Dec() watchersCoalescing.Dec()
} }