Merge pull request #6550 from heyitsanthony/watch-prog-notify

clientv3: make IsProgressNotify() false on compact event and closed channel
etcd-io · Sep 29, 2016 · c349e08 · c349e08
2 parents dac6e70 + 6ac284a
commit c349e08
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/clientv3/watch.go b/clientv3/watch.go
@@ -92,7 +92,7 @@ func (wr *WatchResponse) Err() error {
 
 // IsProgressNotify returns true if the WatchResponse is progress notification.
 func (wr *WatchResponse) IsProgressNotify() bool {
- return len(wr.Events) == 0 && !wr.Canceled && !wr.Created
+ return len(wr.Events) == 0 && !wr.Canceled && !wr.Created && wr.CompactRevision == 0 && wr.Header.Revision != 0
 }
 
 // watcher implements the Watcher interface

diff --git a/proxy/grpcproxy/watcher_group_test.go b/proxy/grpcproxy/watcher_group_test.go
@@ -40,7 +40,7 @@ func TestWatchgroupBroadcast(t *testing.T) {
  }
 
  // send a progress response
- wch <- clientv3.WatchResponse{}
+ wch <- clientv3.WatchResponse{Header: pb.ResponseHeader{Revision: 1}}
 
  for _, ch := range chs {
  <-ch