Merge pull request #11754 from polyrabbit/unpermitted-watch

etcdserver: watch stream got closed if one watch request is not permitted
etcd-io · Apr 6, 2020 · 22e1bad · 22e1bad
2 parents 03fec33 + 73b936b
commit 22e1bad
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/etcdserver/api/v3rpc/watch.go b/etcdserver/api/v3rpc/watch.go
@@ -255,9 +255,10 @@ func (sws *serverWatchStream) recvLoop() error {
 
 				select {
 				case sws.ctrlStream <- wr:
+					continue
 				case <-sws.closec:
+					return nil
 				}
-				return nil
 			}
 
 			filters := FiltersFromRequest(creq)