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

…4-upstream-release-3.4 Automated cherry pick of #11754 on release-3.4
etcd-io · Apr 6, 2020 · e2ae601 · e2ae601
2 parents e694b7b + 9c85545
commit e2ae601
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/etcdserver/api/v3rpc/watch.go b/etcdserver/api/v3rpc/watch.go
@@ -259,9 +259,10 @@ func (sws *serverWatchStream) recvLoop() error {
 
 				select {
 				case sws.ctrlStream <- wr:
+					continue
 				case <-sws.closec:
+					return nil
 				}
-				return nil
 			}
 
 			filters := FiltersFromRequest(creq)