Merge pull request #11758 from jingyih/automated-cherry-pick-of-#1175…

…4-upstream-release-3.3 Automated cherry pick of #11754 on release-3.3
etcd-io · Jun 22, 2020 · 3bf09a5 · 3bf09a5
2 parents 282cce7 + 8781e1d
commit 3bf09a5
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/etcdserver/api/v3rpc/watch.go b/etcdserver/api/v3rpc/watch.go
@@ -230,9 +230,10 @@ func (sws *serverWatchStream) recvLoop() error {
 
 				select {
 				case sws.ctrlStream <- wr:
+					continue
 				case <-sws.closec:
+					return nil
 				}
-				return nil
 			}
 
 			filters := FiltersFromRequest(creq)