v3rpc: don't elide next progress notification on progress notification

Fixes #5878
2016-07-20 11:37:20 -07:00 · 2016-07-20 11:37:20 -07:00 · 299ebc6137
parent aba478fb8a
commit 299ebc6137
1 changed files with 2 additions and 1 deletions
--- a/etcdserver/api/v3rpc/watch.go
+++ b/etcdserver/api/v3rpc/watch.go
@ -295,7 +295,8 @@ func (sws *serverWatchStream) sendLoop() {
 			}

 			sws.mu.Lock()
-			if _, ok := sws.progress[wresp.WatchID]; ok {
+			if len(evs) > 0 && sws.progress[wresp.WatchID] {
+				// elide next progress update if sent a key update
 				sws.progress[wresp.WatchID] = false
 			}
 			sws.mu.Unlock()