clientv3: remove excessive watch cancel logging
@@ -180,6 +180,8 @@ type watchGrpcStream struct {
resumec chan struct{}
// closeErr is the error that closed the watch stream
closeErr error
+
+ lg *zap.Logger
}
// watchStreamRequest is a union of the supported watch request operation types
@@ -278,6 +280,7 @@ func (w *watcher) newWatcherGrpcStream(inctx context.Context) *watchGrpcStream {
errc: make(chan error, 1),
closingc: make(chan *watcherStream),
resumec: make(chan struct{}),
+ lg: w.lg,
}
go wgs.run()
return wgs
@@ -555,12 +558,12 @@ func (w *watchGrpcStream) run() {
if len(w.resuming) == 1 {
// head of resume queue, can register a new watcher
if err := wc.Send(ws.initReq.toPB()); err != nil {
- lg.Warningf("error when sending request: %v", err)
+ w.lg.Debug("error when sending request", zap.Error(err))
}
}
case *progressRequest:
if err := wc.Send(wreq.toPB()); err != nil {
- lg.Warningf("error when sending request: %v", err)
+ w.lg.Debug("error when sending request", zap.Error(err))
}
}
@@ -586,7 +589,7 @@ func (w *watchGrpcStream) run() {
if ws := w.nextResume(); ws != nil {
if err := wc.Send(ws.initReq.toPB()); err != nil {
- lg.Warningf("error when sending request: %v", err)
+ w.lg.Debug("error when sending request", zap.Error(err))
}
}
@@ -632,9 +635,9 @@ func (w *watchGrpcStream) run() {
},
}
req := &pb.WatchRequest{RequestUnion: cr}
- lg.Info("sending watch cancel request for failed dispatch", zap.Int64("watch-id", pbresp.WatchId))
+ w.lg.Debug("sending watch cancel request for failed dispatch", zap.Int64("watch-id", pbresp.WatchId))
if err := wc.Send(req); err != nil {
- lg.Warning("failed to send watch cancel request", zap.Int64("watch-id", pbresp.WatchId), zap.Error(err))
+ w.lg.Debug("failed to send watch cancel request", zap.Int64("watch-id", pbresp.WatchId), zap.Error(err))
}
}
@@ -649,7 +652,7 @@ func (w *watchGrpcStream) run() {
}
if ws := w.nextResume(); ws != nil {
if err := wc.Send(ws.initReq.toPB()); err != nil {
- lg.Warningf("error when sending request: %v", err)
+ w.lg.Debug("error when sending request", zap.Error(err))
}
}
cancelSet = make(map[int64]struct{})
@@ -674,9 +677,9 @@ func (w *watchGrpcStream) run() {
},
}
req := &pb.WatchRequest{RequestUnion: cr}
- lg.Info("sending watch cancel request for closed watcher", zap.Int64("watch-id", ws.id))
+ w.lg.Debug("sending watch cancel request for closed watcher", zap.Int64("watch-id", ws.id))
if err := wc.Send(req); err != nil {
- lg.Warning("failed to send watch cancel request", zap.Int64("watch-id", ws.id), zap.Error(err))
+ w.lg.Debug("failed to send watch cancel request", zap.Int64("watch-id", ws.id), zap.Error(err))
}
}
}
