*: fix panic log

Signed-off-by: crazycs520 <crazycs520@gmail.com>
This commit is contained in:
crazycs520 2023-09-11 14:38:07 +08:00
parent dbe9bcf803
commit ba3de39920
3 changed files with 6 additions and 6 deletions

View File

@ -301,7 +301,7 @@ func (a *batchConn) batchSendLoop(cfg config.TiKVClient) {
if r := recover(); r != nil { if r := recover(); r != nil {
metrics.TiKVPanicCounter.WithLabelValues(metrics.LabelBatchSendLoop).Inc() metrics.TiKVPanicCounter.WithLabelValues(metrics.LabelBatchSendLoop).Inc()
logutil.BgLogger().Error("batchSendLoop", logutil.BgLogger().Error("batchSendLoop",
zap.Reflect("r", r), zap.Any("r", r),
zap.Stack("stack")) zap.Stack("stack"))
logutil.BgLogger().Info("restart batchSendLoop") logutil.BgLogger().Info("restart batchSendLoop")
go a.batchSendLoop(cfg) go a.batchSendLoop(cfg)
@ -436,7 +436,7 @@ func (s *batchCommandsStream) recv() (resp *tikvpb.BatchCommandsResponse, err er
if r := recover(); r != nil { if r := recover(); r != nil {
metrics.TiKVPanicCounter.WithLabelValues(metrics.LabelBatchRecvLoop).Inc() metrics.TiKVPanicCounter.WithLabelValues(metrics.LabelBatchRecvLoop).Inc()
logutil.BgLogger().Error("batchCommandsClient.recv panic", logutil.BgLogger().Error("batchCommandsClient.recv panic",
zap.Reflect("r", r), zap.Any("r", r),
zap.Stack("stack")) zap.Stack("stack"))
err = errors.New("batch conn recv paniced") err = errors.New("batch conn recv paniced")
} }
@ -604,7 +604,7 @@ func (c *batchCommandsClient) batchRecvLoop(cfg config.TiKVClient, tikvTransport
if r := recover(); r != nil { if r := recover(); r != nil {
metrics.TiKVPanicCounter.WithLabelValues(metrics.LabelBatchRecvLoop).Inc() metrics.TiKVPanicCounter.WithLabelValues(metrics.LabelBatchRecvLoop).Inc()
logutil.BgLogger().Error("batchRecvLoop", logutil.BgLogger().Error("batchRecvLoop",
zap.Reflect("r", r), zap.Any("r", r),
zap.Stack("stack")) zap.Stack("stack"))
logutil.BgLogger().Info("restart batchRecvLoop") logutil.BgLogger().Info("restart batchRecvLoop")
go c.batchRecvLoop(cfg, tikvTransportLayerLoad, streamClient) go c.batchRecvLoop(cfg, tikvTransportLayerLoad, streamClient)

View File

@ -587,7 +587,7 @@ func (c *RegionCache) checkAndResolve(needCheckStores []*Store, needCheck func(*
r := recover() r := recover()
if r != nil { if r != nil {
logutil.BgLogger().Error("panic in the checkAndResolve goroutine", logutil.BgLogger().Error("panic in the checkAndResolve goroutine",
zap.Reflect("r", r), zap.Any("r", r),
zap.Stack("stack trace")) zap.Stack("stack trace"))
} }
}() }()
@ -2993,7 +2993,7 @@ func (c *RegionCache) checkAndUpdateStoreSlowScores() {
r := recover() r := recover()
if r != nil { if r != nil {
logutil.BgLogger().Error("panic in the checkAndUpdateStoreSlowScores goroutine", logutil.BgLogger().Error("panic in the checkAndUpdateStoreSlowScores goroutine",
zap.Reflect("r", r), zap.Any("r", r),
zap.Stack("stack trace")) zap.Stack("stack trace"))
} }
}() }()

View File

@ -89,7 +89,7 @@ func WithRecovery(exec func(), recoverFn func(r interface{})) {
} }
if r != nil { if r != nil {
logutil.BgLogger().Error("panic in the recoverable goroutine", logutil.BgLogger().Error("panic in the recoverable goroutine",
zap.Reflect("r", r), zap.Any("r", r),
zap.Stack("stack trace")) zap.Stack("stack trace"))
} }
}() }()