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

Merge pull request #7319 from heyitsanthony/fix-compact-watch

Browse Source 
grpcproxy: respect CompactRevision in watcher
This commit is contained in:
Anthony Romano 2017-02-13 16:46:34 -08:00 committed by GitHub
commit c200be6432
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
proxy/grpcproxy/watcher.go
View File

@ -102,16 +102,17 @@ func (w *watcher) send(wr clientv3.WatchResponse) {
} }
// all events are filtered out? // all events are filtered out?
if !wr.IsProgressNotify() && !wr.Created && len(events) == 0 { if !wr.IsProgressNotify() && !wr.Created && len(events) == 0 && wr.CompactRevision == 0 {
return return
} }
w.lastHeader = wr.Header w.lastHeader = wr.Header
w.post(&pb.WatchResponse{ w.post(&pb.WatchResponse{
Header: &wr.Header, Header: &wr.Header,
Created: wr.Created, Created: wr.Created,
WatchId: w.id, CompactRevision: wr.CompactRevision,
Events: events, WatchId: w.id,
Events: events,
}) })
} }