From 299ebc6137e3ce1fe0135cddb91abb71b7aa630c Mon Sep 17 00:00:00 2001
From: Anthony Romano <anthony.romano@coreos.com>
Date: Wed, 20 Jul 2016 11:37:20 -0700
Subject: [PATCH] v3rpc: don't elide next progress notification on progress
 notification

Fixes #5878
---
 etcdserver/api/v3rpc/watch.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/etcdserver/api/v3rpc/watch.go b/etcdserver/api/v3rpc/watch.go
index 0630a7480..fbf8f06a6 100644
--- 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()