|
|
@@ -140,7 +140,11 @@ func (ws *watchServer) Watch(stream pb.Watch_WatchServer) (err error) {
|
|
|
// deadlock when calling sws.close().
|
|
|
go func() {
|
|
|
if rerr := sws.recvLoop(); rerr != nil {
|
|
|
- plog.Debugf("failed to receive watch request from gRPC stream (%q)", rerr.Error())
|
|
|
+ if isClientCtxErr(stream.Context().Err(), rerr) {
|
|
|
+ plog.Debugf("failed to receive watch request from gRPC stream (%q)", rerr.Error())
|
|
|
+ } else {
|
|
|
+ plog.Warningf("failed to receive watch request from gRPC stream (%q)", rerr.Error())
|
|
|
+ }
|
|
|
errc <- rerr
|
|
|
}
|
|
|
}()
|
|
|
@@ -339,7 +343,11 @@ func (sws *serverWatchStream) sendLoop() {
|
|
|
|
|
|
mvcc.ReportEventReceived(len(evs))
|
|
|
if err := sws.gRPCStream.Send(wr); err != nil {
|
|
|
- plog.Debugf("failed to send watch response to gRPC stream (%q)", err.Error())
|
|
|
+ if isClientCtxErr(sws.gRPCStream.Context().Err(), err) {
|
|
|
+ plog.Debugf("failed to send watch response to gRPC stream (%q)", err.Error())
|
|
|
+ } else {
|
|
|
+ plog.Warningf("failed to send watch response to gRPC stream (%q)", err.Error())
|
|
|
+ }
|
|
|
return
|
|
|
}
|
|
|
|
|
|
@@ -356,7 +364,11 @@ func (sws *serverWatchStream) sendLoop() {
|
|
|
}
|
|
|
|
|
|
if err := sws.gRPCStream.Send(c); err != nil {
|
|
|
- plog.Debugf("failed to send watch control response to gRPC stream (%q)", err.Error())
|
|
|
+ if isClientCtxErr(sws.gRPCStream.Context().Err(), err) {
|
|
|
+ plog.Debugf("failed to send watch control response to gRPC stream (%q)", err.Error())
|
|
|
+ } else {
|
|
|
+ plog.Warningf("failed to send watch control response to gRPC stream (%q)", err.Error())
|
|
|
+ }
|
|
|
return
|
|
|
}
|
|
|
|
|
|
@@ -372,7 +384,11 @@ func (sws *serverWatchStream) sendLoop() {
|
|
|
for _, v := range pending[wid] {
|
|
|
mvcc.ReportEventReceived(len(v.Events))
|
|
|
if err := sws.gRPCStream.Send(v); err != nil {
|
|
|
- plog.Debugf("failed to send pending watch response to gRPC stream (%q)", err.Error())
|
|
|
+ if isClientCtxErr(sws.gRPCStream.Context().Err(), err) {
|
|
|
+ plog.Debugf("failed to send pending watch response to gRPC stream (%q)", err.Error())
|
|
|
+ } else {
|
|
|
+ plog.Warningf("failed to send pending watch response to gRPC stream (%q)", err.Error())
|
|
|
+ }
|
|
|
return
|
|
|
}
|
|
|
}
|