From 0354d39ae8bb965a9cd3ad63727a91a7361204fc Mon Sep 17 00:00:00 2001 From: Wei Fu Date: Sat, 17 Feb 2024 17:20:21 +0800 Subject: [PATCH] server/verify: use retErr to shadow local err validateConsistentIndex function might return err but defer might still log it's successful. Signed-off-by: Wei Fu --- server/verify/verify.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/server/verify/verify.go b/server/verify/verify.go index 6aaf1422aee..498f0d56b3c 100644 --- a/server/verify/verify.go +++ b/server/verify/verify.go @@ -48,7 +48,7 @@ type Config struct { // the function can also panic. // The function is expected to work on not-in-use data model, i.e. // no file-locks should be taken. Verify does not modified the data. -func Verify(cfg Config) error { +func Verify(cfg Config) (retErr error) { lg := cfg.Logger if lg == nil { lg = zap.NewNop() @@ -59,13 +59,12 @@ func Verify(cfg Config) error { return nil } - var err error lg.Info("verification of persisted state", zap.String("data-dir", cfg.DataDir)) defer func() { - if err != nil { + if retErr != nil { lg.Error("verification of persisted state failed", zap.String("data-dir", cfg.DataDir), - zap.Error(err)) + zap.Error(retErr)) } else if r := recover(); r != nil { lg.Error("verification of persisted state failed", zap.String("data-dir", cfg.DataDir))