v3rpc: make watcher wait for its send goroutine to finish
parent
0df5bb0002
commit
c438310634
|
@ -94,9 +94,12 @@ type serverWatchStream struct {
|
|||
|
||||
// closec indicates the stream is closed.
|
||||
closec chan struct{}
|
||||
|
||||
// wg waits for the send loop to complete
|
||||
wg sync.WaitGroup
|
||||
}
|
||||
|
||||
func (ws *watchServer) Watch(stream pb.Watch_WatchServer) error {
|
||||
func (ws *watchServer) Watch(stream pb.Watch_WatchServer) (err error) {
|
||||
sws := serverWatchStream{
|
||||
clusterID: ws.clusterID,
|
||||
memberID: ws.memberID,
|
||||
|
@ -109,23 +112,30 @@ func (ws *watchServer) Watch(stream pb.Watch_WatchServer) error {
|
|||
closec: make(chan struct{}),
|
||||
}
|
||||
|
||||
go sws.sendLoop()
|
||||
errc := make(chan error, 1)
|
||||
sws.wg.Add(1)
|
||||
go func() {
|
||||
errc <- sws.recvLoop()
|
||||
sws.close()
|
||||
sws.sendLoop()
|
||||
sws.wg.Done()
|
||||
}()
|
||||
|
||||
errc := make(chan error, 1)
|
||||
// Ideally recvLoop would also use sws.wg to signal its completion
|
||||
// but when stream.Context().Done() is closed, the stream's recv
|
||||
// may continue to block since it uses a different context, leading to
|
||||
// deadlock when calling sws.close().
|
||||
go func() { errc <- sws.recvLoop() }()
|
||||
|
||||
select {
|
||||
case err := <-errc:
|
||||
return err
|
||||
case err = <-errc:
|
||||
case <-stream.Context().Done():
|
||||
err := stream.Context().Err()
|
||||
err = stream.Context().Err()
|
||||
// the only server-side cancellation is noleader for now.
|
||||
if err == context.Canceled {
|
||||
return rpctypes.ErrGRPCNoLeader
|
||||
err = rpctypes.ErrGRPCNoLeader
|
||||
}
|
||||
return err
|
||||
}
|
||||
sws.close()
|
||||
return err
|
||||
}
|
||||
|
||||
func (sws *serverWatchStream) recvLoop() error {
|
||||
|
@ -292,6 +302,7 @@ func (sws *serverWatchStream) close() {
|
|||
sws.watchStream.Close()
|
||||
close(sws.closec)
|
||||
close(sws.ctrlStream)
|
||||
sws.wg.Wait()
|
||||
}
|
||||
|
||||
func (sws *serverWatchStream) newResponseHeader(rev int64) *pb.ResponseHeader {
|
||||
|
|
Loading…
Reference in New Issue