Merge pull request #18857 from ghouscht/fix-govet-shadow

build: fix govet shadow err
etcd-io · Nov 8, 2024 · 1ee6598 · 1ee6598
2 parents b125409 + 97d19b6
commit 1ee6598
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/server/storage/backend/backend.go b/server/storage/backend/backend.go
@@ -500,11 +500,11 @@ func (b *backend) defrag() error {
 	tmpdb, err := bolt.Open(tdbp, 0600, &options)
 	if err != nil {
 		temp.Close()
-		if err := os.Remove(temp.Name()); err != nil && b.lg != nil {
+		if rmErr := os.Remove(temp.Name()); rmErr != nil && b.lg != nil {
 			b.lg.Error(
 				"failed to remove temporary file",
 				zap.String("path", temp.Name()),
-				zap.Error(err),
+				zap.Error(rmErr),
 			)
 		}