Merge pull request #6587 from heyitsanthony/watch-fix-revrace

clientv3: fix race on watch initial revision
etcd-io · Oct 5, 2016 · f67f8d3 · f67f8d3
2 parents d5cd563 + 06d5cf2
commit f67f8d3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/clientv3/watch.go b/clientv3/watch.go
@@ -573,7 +573,6 @@ func (w *watchGrpcStream) serveSubstream(ws *watcherStream, resumec chan struct{
 		if !resuming {
 			ws.closing = true
 		}
-		ws.initReq.rev = nextRev
 		close(ws.donec)
 		if !resuming {
 			w.closingc <- ws
@@ -619,6 +618,7 @@ func (w *watchGrpcStream) serveSubstream(ws *watcherStream, resumec chan struct{
 			if len(wr.Events) > 0 {
 				nextRev = wr.Events[len(wr.Events)-1].Kv.ModRevision + 1
 			}
+			ws.initReq.rev = nextRev
 		case <-ws.initReq.ctx.Done():
 			return
 		case <-resumec: