Merge pull request #6852 from heyitsanthony/fix-proxy-dbarrier

grpcproxy: watch next revision should be start revision when not 0
This commit is contained in:
Anthony Romano 2016-11-15 09:21:18 -08:00 committed by GitHub
commit 7c8f13aed7

View File

@ -81,7 +81,10 @@ func newWatchBroadcast(wp *watchProxy, w *watcher, update func(*watchBroadcast))
func (wb *watchBroadcast) bcast(wr clientv3.WatchResponse) {
wb.mu.Lock()
defer wb.mu.Unlock()
wb.nextrev = wr.Header.Revision + 1
// watchers start on the given revision, if any; ignore header rev on create
if wb.responses > 0 || wb.nextrev == 0 {
wb.nextrev = wr.Header.Revision + 1
}
wb.responses++
for r := range wb.receivers {
r.send(wr)