aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2020-03-10 13:33:26 -0700
committerChris Lu <chris.lu@gmail.com>2020-03-10 13:33:26 -0700
commitd3e1ef64b3db95ed435b9c19bca13378c46383b7 (patch)
tree60cd46dabfcc7d9ee8e58ebff34bf1ac4dfc5db5
parent88a110e67ed413913a22fbe4e4b965590b56e0b1 (diff)
downloadseaweedfs-d3e1ef64b3db95ed435b9c19bca13378c46383b7.tar.xz
seaweedfs-d3e1ef64b3db95ed435b9c19bca13378c46383b7.zip
ensure error checking on windows
-rw-r--r--weed/storage/volume_vacuum.go12
1 files 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
})