cleanup tmp file if file renaming failed

Signed-off-by: zhulongcheng <[email protected]>

Author: zhulongcheng

block.go

@@ -29,6 +29,7 @@ import (
 	"github.com/prometheus/tsdb/chunkenc"
 	"github.com/prometheus/tsdb/chunks"
 	tsdb_errors "github.com/prometheus/tsdb/errors"
+	"github.com/prometheus/tsdb/fileutil"
 	"github.com/prometheus/tsdb/index"
 	"github.com/prometheus/tsdb/labels"
 )
@@ -259,7 +260,14 @@ func writeMetaFile(dir string, meta *BlockMeta) error {
 	if err := f.Close(); err != nil {
 		return err
 	}
-	return renameFile(tmp, path)
+
+	if err := fileutil.Rename(tmp, path); err != nil {
+		merr.Add(err)
+		merr.Add(os.RemoveAll(tmp))
+		return merr.Err()
+	}
+
+	return nil
 }
 
 // Block represents a directory of time series data covering a continuous time range.

compact.go

@@ -637,7 +637,7 @@ func (c *LeveledCompactor) write(dest string, meta *BlockMeta, blocks ...BlockRe
 	df = nil
 
 	// Block successfully written, make visible and remove old ones.
-	if err := renameFile(tmp, dir); err != nil {
+	if err := fileutil.Rename(tmp, dir); err != nil {
 		return errors.Wrap(err, "rename block dir")
 	}
 
@@ -1011,24 +1011,3 @@ func (c *compactionMerger) Err() error {
 func (c *compactionMerger) At() (labels.Labels, []chunks.Meta, Intervals) {
 	return c.l, c.c, c.intervals
 }
-
-func renameFile(from, to string) error {
-	if err := os.RemoveAll(to); err != nil {
-		return err
-	}
-	if err := os.Rename(from, to); err != nil {
-		return err
-	}
-
-	// Directory was renamed; sync parent dir to persist rename.
-	pdir, err := fileutil.OpenDir(filepath.Dir(to))
-	if err != nil {
-		return err
-	}
-
-	if err = pdir.Sync(); err != nil {
-		pdir.Close()
-		return err
-	}
-	return pdir.Close()
-}

repair.go

@@ -23,6 +23,8 @@ import (
 	"github.com/go-kit/kit/log"
 	"github.com/go-kit/kit/log/level"
 	"github.com/pkg/errors"
+	tsdb_errors "github.com/prometheus/tsdb/errors"
+	"github.com/prometheus/tsdb/fileutil"
 )
 
 // repairBadIndexVersion repairs an issue in index and meta.json persistence introduced in
@@ -83,8 +85,11 @@ func repairBadIndexVersion(logger log.Logger, dir string) error {
 		if err := broken.Close(); err != nil {
 			return wrapErr(err, d)
 		}
-		if err := renameFile(repl.Name(), broken.Name()); err != nil {
-			return wrapErr(err, d)
+		if err := fileutil.Rename(repl.Name(), broken.Name()); err != nil {
+			var merr tsdb_errors.MultiError
+			merr.Add(wrapErr(err, d))
+			merr.Add(os.RemoveAll(repl.Name()))
+			return merr.Err()
 		}
 		// Reset version of meta.json to 1.
 		meta.Version = 1

tombstones.go

@@ -24,6 +24,8 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/prometheus/tsdb/encoding"
+	tsdb_errors "github.com/prometheus/tsdb/errors"
+	"github.com/prometheus/tsdb/fileutil"
 )
 
 const tombstoneFilename = "tombstones"
@@ -104,7 +106,14 @@ func writeTombstoneFile(dir string, tr TombstoneReader) error {
 		return err
 	}
 	f = nil
-	return renameFile(tmp, path)
+
+	if err := fileutil.Rename(tmp, path); err != nil {
+		var merr tsdb_errors.MultiError
+		merr.Add(err)
+		merr.Add(os.RemoveAll(tmp))
+		return merr.Err()
+	}
+	return nil
 }
 
 // Stone holds the information on the posting and time-range

wal.go

@@ -32,6 +32,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/tsdb/encoding"
+	tsdb_errors "github.com/prometheus/tsdb/errors"
 	"github.com/prometheus/tsdb/fileutil"
 	"github.com/prometheus/tsdb/labels"
 	"github.com/prometheus/tsdb/wal"
@@ -389,9 +390,13 @@ func (w *SegmentWAL) Truncate(mint int64, keep func(uint64) bool) error {
 	csf.Close()
 
 	candidates[0].Close() // need close before remove on platform windows
-	if err := renameFile(csf.Name(), candidates[0].Name()); err != nil {
-		return errors.Wrap(err, "rename compaction segment")
+	if err := fileutil.Rename(csf.Name(), candidates[0].Name()); err != nil {
+		var merr tsdb_errors.MultiError
+		merr.Add(errors.Wrap(err, "rename compaction segment"))
+		merr.Add(os.RemoveAll(csf.Name()))
+		return merr.Err()
 	}
+
 	for _, f := range candidates[1:] {
 		f.Close() // need close before remove on platform windows
 		if err := os.RemoveAll(f.Name()); err != nil {