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

server/verify: use retErr to shadow local err

Browse Source 
validateConsistentIndex function might return err but defer might still
log it's successful.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
This commit is contained in:
Wei Fu 2024-02-17 17:20:21 +08:00
parent 484b115977
commit 0354d39ae8
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/verify/verify.go
View File

@ -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))