From 7e0e6bf4979b93b690ed9ec574cc6824647c68a4 Mon Sep 17 00:00:00 2001 From: Ted Yu Date: Fri, 14 Feb 2020 12:10:24 -0800 Subject: [PATCH] mvcc/backend: remove db.tmp regardless of logger presence --- etcdserver/api/snap/snapshotter.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/etcdserver/api/snap/snapshotter.go b/etcdserver/api/snap/snapshotter.go index 87f33e598..ff1725644 100644 --- a/etcdserver/api/snap/snapshotter.go +++ b/etcdserver/api/snap/snapshotter.go @@ -240,11 +240,9 @@ func checkSuffix(lg *zap.Logger, names []string) []string { func (s *Snapshotter) cleanupSnapdir(filenames []string) error { for _, filename := range filenames { if strings.HasPrefix(filename, "db.tmp") { - if s.lg != nil { - s.lg.Info("found orphaned defragmentation file; deleting", zap.String("path", filename)) - if rmErr := os.Remove(filepath.Join(s.dir, filename)); rmErr != nil && !os.IsNotExist(rmErr) { - return fmt.Errorf("failed to remove orphaned defragmentation file %s: %v", filename, rmErr) - } + s.lg.Info("found orphaned defragmentation file; deleting", zap.String("path", filename)) + if rmErr := os.Remove(filepath.Join(s.dir, filename)); rmErr != nil && !os.IsNotExist(rmErr) { + return fmt.Errorf("failed to remove orphaned defragmentation file %s: %v", filename, rmErr) } } }