Merge pull request #18854 from ghouscht/backport-defrag-close-temp-3.5

[3.5] fix(defrag): close temp file in case of error
etcd-io · Nov 9, 2024 · 4726460 · 4726460
2 parents d770310 + b2ba488
commit 4726460
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/server/mvcc/backend/backend.go b/server/mvcc/backend/backend.go
@@ -499,6 +499,15 @@ func (b *backend) defrag() error {
 	tdbp := temp.Name()
 	tmpdb, err := bolt.Open(tdbp, 0600, &options)
 	if err != nil {
+		temp.Close()
+		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(rmErr),
+			)
+		}
+
 		return err
 	}