From d3e1ef64b3db95ed435b9c19bca13378c46383b7 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Tue, 10 Mar 2020 13:33:26 -0700 Subject: [PATCH] ensure error checking on windows --- weed/storage/volume_vacuum.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/weed/storage/volume_vacuum.go b/weed/storage/volume_vacuum.go index 5d712c7ff..5d0d63877 100644 --- a/weed/storage/volume_vacuum.go +++ b/weed/storage/volume_vacuum.go @@ -113,8 +113,14 @@ func (v *Volume) CommitCompact() error { } } else { if runtime.GOOS == "windows" { - os.RemoveAll(v.FileName() + ".dat") - os.RemoveAll(v.FileName() + ".idx") + e = os.RemoveAll(v.FileName() + ".dat") + if e != nil { + return e + } + e = os.RemoveAll(v.FileName() + ".idx") + if e != nil { + return e + } } var e error if e = os.Rename(v.FileName()+".cpd", v.FileName()+".dat"); e != nil { @@ -414,7 +420,7 @@ func copyDataBasedOnIndexFile(srcDatName, srcIdxName, dstDatName, datIdxName str return fmt.Errorf("cannot append needle: %s", err) } newOffset += n.DiskSize(version) - glog.V(3).Infoln("saving key", n.Id, "volume offset", offset, "=>", newOffset, "data_size", n.Size) + glog.V(4).Infoln("saving key", n.Id, "volume offset", offset, "=>", newOffset, "data_size", n.Size) return nil })