Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

clientv3: remove excessive watch cancel logging

Browse Source
This commit is contained in:
jingyih 2020-07-30 00:29:22 +08:00
parent e800c62eca
commit 6fcab5af9f
1 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
clientv3/watch.go
View File

@ -178,6 +178,8 @@ type watchGrpcStream struct {
resumec chan struct{} resumec chan struct{}
// closeErr is the error that closed the watch stream // closeErr is the error that closed the watch stream
closeErr error closeErr error
lg *zap.Logger
} }
// watchStreamRequest is a union of the supported watch request operation types // watchStreamRequest is a union of the supported watch request operation types
@ -276,6 +278,7 @@ func (w *watcher) newWatcherGrpcStream(inctx context.Context) *watchGrpcStream {
errc: make(chan error, 1), errc: make(chan error, 1),
closingc: make(chan *watcherStream), closingc: make(chan *watcherStream),
resumec: make(chan struct{}), resumec: make(chan struct{}),
lg: w.lg,
} }
go wgs.run() go wgs.run()
return wgs return wgs
@ -548,12 +551,16 @@ func (w *watchGrpcStream) run() {
if len(w.resuming) == 1 { if len(w.resuming) == 1 {
// head of resume queue, can register a new watcher // head of resume queue, can register a new watcher
if err := wc.Send(ws.initReq.toPB()); err != nil { if err := wc.Send(ws.initReq.toPB()); err != nil {
lg.Warningf("error when sending request: %v", err) if w.lg != nil {
w.lg.Debug("error when sending request", zap.Error(err))
}
} }
} }
case *progressRequest: case *progressRequest:
if err := wc.Send(wreq.toPB()); err != nil { if err := wc.Send(wreq.toPB()); err != nil {
lg.Warningf("error when sending request: %v", err) if w.lg != nil {
w.lg.Debug("error when sending request", zap.Error(err))
}
} }
} }
@ -579,7 +586,9 @@ func (w *watchGrpcStream) run() {
if ws := w.nextResume(); ws != nil { if ws := w.nextResume(); ws != nil {
if err := wc.Send(ws.initReq.toPB()); err != nil { if err := wc.Send(ws.initReq.toPB()); err != nil {
lg.Warningf("error when sending request: %v", err) if w.lg != nil {
w.lg.Debug("error when sending request", zap.Error(err))
}
} }
} }
@ -625,9 +634,13 @@ func (w *watchGrpcStream) run() {
}, },
} }
req := &pb.WatchRequest{RequestUnion: cr} req := &pb.WatchRequest{RequestUnion: cr}
lg.Info("sending watch cancel request for failed dispatch", zap.Int64("watch-id", pbresp.WatchId)) if w.lg != nil {
w.lg.Debug("sending watch cancel request for failed dispatch", zap.Int64("watch-id", pbresp.WatchId))
}
if err := wc.Send(req); err != nil { if err := wc.Send(req); err != nil {
lg.Warning("failed to send watch cancel request", zap.Int64("watch-id", pbresp.WatchId), zap.Error(err)) if w.lg != nil {
w.lg.Debug("failed to send watch cancel request", zap.Int64("watch-id", pbresp.WatchId), zap.Error(err))
}
} }
} }
@ -642,7 +655,9 @@ func (w *watchGrpcStream) run() {
} }
if ws := w.nextResume(); ws != nil { if ws := w.nextResume(); ws != nil {
if err := wc.Send(ws.initReq.toPB()); err != nil { if err := wc.Send(ws.initReq.toPB()); err != nil {
lg.Warningf("error when sending request: %v", err) if w.lg != nil {
w.lg.Debug("error when sending request", zap.Error(err))
}
} }
} }
cancelSet = make(map[int64]struct{}) cancelSet = make(map[int64]struct{})
@ -661,9 +676,13 @@ func (w *watchGrpcStream) run() {
}, },
} }
req := &pb.WatchRequest{RequestUnion: cr} req := &pb.WatchRequest{RequestUnion: cr}
lg.Info("sending watch cancel request for closed watcher", zap.Int64("watch-id", ws.id)) if w.lg != nil {
w.lg.Debug("sending watch cancel request for closed watcher", zap.Int64("watch-id", ws.id))
}
if err := wc.Send(req); err != nil { if err := wc.Send(req); err != nil {
lg.Warning("failed to send watch cancel request", zap.Int64("watch-id", ws.id), zap.Error(err)) if w.lg != nil {
w.lg.Debug("failed to send watch cancel request", zap.Int64("watch-id", ws.id), zap.Error(err))
}
} }
} }
w.closeSubstream(ws) w.closeSubstream(ws)