From ba3de39920f87c902796b4c2b1078b8e055aab4f Mon Sep 17 00:00:00 2001 From: crazycs520 Date: Mon, 11 Sep 2023 14:38:07 +0800 Subject: [PATCH] *: fix panic log Signed-off-by: crazycs520 --- internal/client/client_batch.go | 6 +++--- internal/locate/region_cache.go | 4 ++-- util/misc.go | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/client/client_batch.go b/internal/client/client_batch.go index 6a270bc6..632d6f30 100644 --- a/internal/client/client_batch.go +++ b/internal/client/client_batch.go @@ -301,7 +301,7 @@ func (a *batchConn) batchSendLoop(cfg config.TiKVClient) { if r := recover(); r != nil { metrics.TiKVPanicCounter.WithLabelValues(metrics.LabelBatchSendLoop).Inc() logutil.BgLogger().Error("batchSendLoop", - zap.Reflect("r", r), + zap.Any("r", r), zap.Stack("stack")) logutil.BgLogger().Info("restart batchSendLoop") go a.batchSendLoop(cfg) @@ -436,7 +436,7 @@ func (s *batchCommandsStream) recv() (resp *tikvpb.BatchCommandsResponse, err er if r := recover(); r != nil { metrics.TiKVPanicCounter.WithLabelValues(metrics.LabelBatchRecvLoop).Inc() logutil.BgLogger().Error("batchCommandsClient.recv panic", - zap.Reflect("r", r), + zap.Any("r", r), zap.Stack("stack")) err = errors.New("batch conn recv paniced") } @@ -604,7 +604,7 @@ func (c *batchCommandsClient) batchRecvLoop(cfg config.TiKVClient, tikvTransport if r := recover(); r != nil { metrics.TiKVPanicCounter.WithLabelValues(metrics.LabelBatchRecvLoop).Inc() logutil.BgLogger().Error("batchRecvLoop", - zap.Reflect("r", r), + zap.Any("r", r), zap.Stack("stack")) logutil.BgLogger().Info("restart batchRecvLoop") go c.batchRecvLoop(cfg, tikvTransportLayerLoad, streamClient) diff --git a/internal/locate/region_cache.go b/internal/locate/region_cache.go index 56444ac0..e7cfb5b8 100644 --- a/internal/locate/region_cache.go +++ b/internal/locate/region_cache.go @@ -587,7 +587,7 @@ func (c *RegionCache) checkAndResolve(needCheckStores []*Store, needCheck func(* r := recover() if r != nil { logutil.BgLogger().Error("panic in the checkAndResolve goroutine", - zap.Reflect("r", r), + zap.Any("r", r), zap.Stack("stack trace")) } }() @@ -2993,7 +2993,7 @@ func (c *RegionCache) checkAndUpdateStoreSlowScores() { r := recover() if r != nil { logutil.BgLogger().Error("panic in the checkAndUpdateStoreSlowScores goroutine", - zap.Reflect("r", r), + zap.Any("r", r), zap.Stack("stack trace")) } }() diff --git a/util/misc.go b/util/misc.go index bd3e2b77..e324bf79 100644 --- a/util/misc.go +++ b/util/misc.go @@ -89,7 +89,7 @@ func WithRecovery(exec func(), recoverFn func(r interface{})) { } if r != nil { logutil.BgLogger().Error("panic in the recoverable goroutine", - zap.Reflect("r", r), + zap.Any("r", r), zap.Stack("stack trace")) } }()