Bladeren bron

clientv3: close open watch channel if substream is closing on reconnect

If substream is closing but outc is still open while reconnecting, then outc
would only be closed once the watch client would connect or once the watch
client is closed. This was leading to deadlocks in the proxy tests. Instead,
close immediately if the context is canceled.

Fixes #7503
Anthony Romano 9 jaren geleden
bovenliggende
commit
a087325452
1 gewijzigde bestanden met toevoegingen van 4 en 0 verwijderingen
  1. 4 0
      clientv3/watch.go

+ 4 - 0
clientv3/watch.go

@@ -694,6 +694,10 @@ func (w *watchGrpcStream) waitCancelSubstreams(stopc <-chan struct{}) <-chan str
 		go func(ws *watcherStream) {
 		go func(ws *watcherStream) {
 			defer wg.Done()
 			defer wg.Done()
 			if ws.closing {
 			if ws.closing {
+				if ws.initReq.ctx.Err() != nil && ws.outc != nil {
+					close(ws.outc)
+					ws.outc = nil
+				}
 				return
 				return
 			}
 			}
 			select {
 			select {