clientv3: fix race on writing watch channel over return channel

Found in TestElectionFailover
etcd-io · Mar 28, 2016 · d91f90c · d91f90c
1 parent 6a7c8bc
commit d91f90c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/clientv3/watch.go b/clientv3/watch.go
@@ -240,11 +240,11 @@ func (w *watcher) addStream(resp *pb.WatchResponse, pendingReq *watchRequest) {
 	w.streams[ws.id] = ws
 	w.mu.Unlock()
 
-	// send messages to subscriber
-	go w.serveStream(ws)
-
 	// pass back the subscriber channel for the watcher
 	pendingReq.retc <- ret
+
+	// send messages to subscriber
+	go w.serveStream(ws)
 }
 
 // closeStream closes the watcher resources and removes it