From e40da39143c4eaa52598fd57d5ac0578457d0208 Mon Sep 17 00:00:00 2001 From: Anthony Romano Date: Sun, 13 Nov 2016 16:51:31 -0800 Subject: [PATCH] grpcproxy: only coalesce watchers that have received create response Current watchers may have nextrev=0; check response count instead. --- proxy/grpcproxy/watch_broadcasts.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/proxy/grpcproxy/watch_broadcasts.go b/proxy/grpcproxy/watch_broadcasts.go index 38421a448..fc18b7425 100644 --- a/proxy/grpcproxy/watch_broadcasts.go +++ b/proxy/grpcproxy/watch_broadcasts.go @@ -60,8 +60,10 @@ func (wbs *watchBroadcasts) coalesce(wb *watchBroadcast) { continue } wbswb.mu.Lock() - // NB: victim lock already held - if wb.nextrev >= wbswb.nextrev && wbswb.nextrev != 0 { + // 1. check if wbswb is behind wb so it won't skip any events in wb + // 2. ensure wbswb started; nextrev == 0 may mean wbswb is waiting + // for a current watcher and expects a create event from the server. + if wb.nextrev >= wbswb.nextrev && wbswb.responses > 0 { for w := range wb.receivers { wbswb.receivers[w] = struct{}{} wbs.watchers[w] = wbswb