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

grpcproxy: watch next revision should be start revision when not 0

Browse Source 
The create header revision is the current etcd revision. For watches with
rev=0, the next revision is hdr.rev+1. For watches with rev=n, the next
revision should be n.

Fixes TestDoubleBarrier timeouts.
This commit is contained in:
Anthony Romano 2016-11-14 16:42:27 -08:00
parent d073512def
commit 98a7c642d4
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
proxy/grpcproxy/watch_broadcast.go
View File

@ -81,7 +81,10 @@ func newWatchBroadcast(wp *watchProxy, w *watcher, update func(*watchBroadcast))
func (wb *watchBroadcast) bcast(wr clientv3.WatchResponse) { func (wb *watchBroadcast) bcast(wr clientv3.WatchResponse) {
wb.mu.Lock() wb.mu.Lock()
defer wb.mu.Unlock() 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++ wb.responses++
for r := range wb.receivers { for r := range wb.receivers {
r.send(wr) r.send(wr)