diff options
| author | Chris Lu <chrislusf@users.noreply.github.com> | 2022-02-23 00:41:30 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-23 00:41:30 -0800 |
| commit | da58c748bc0f9a18fb620d5929eb5e64940d0d96 (patch) | |
| tree | 7ca1f78005392f4b98f582524e41c2ce6f03b648 | |
| parent | bd092d8318bc8f474dd117e1ce0e49e764eb0f01 (diff) | |
| parent | d68c27f82d589e8b46136fa005bf3cd9c5f4e969 (diff) | |
| download | seaweedfs-da58c748bc0f9a18fb620d5929eb5e64940d0d96.tar.xz seaweedfs-da58c748bc0f9a18fb620d5929eb5e64940d0d96.zip | |
Merge pull request #2698 from guo-sj/fix_bugs_in_return_value
| -rw-r--r-- | weed/storage/volume_vacuum.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/weed/storage/volume_vacuum.go b/weed/storage/volume_vacuum.go index 288f2a565..3bda260d9 100644 --- a/weed/storage/volume_vacuum.go +++ b/weed/storage/volume_vacuum.go @@ -399,7 +399,7 @@ func copyDataBasedOnIndexFile(srcDatName, srcIdxName, dstDatName, datIdxName str dataFile *os.File ) if dstDatBackend, err = backend.CreateVolumeFile(dstDatName, preallocate, 0); err != nil { - return + return err } defer dstDatBackend.Close() @@ -408,7 +408,7 @@ func copyDataBasedOnIndexFile(srcDatName, srcIdxName, dstDatName, datIdxName str newNm := needle_map.NewMemDb() defer newNm.Close() if err = oldNm.LoadFromIdx(srcIdxName); err != nil { - return + return err } if dataFile, err = os.Open(srcDatName); err != nil { return err @@ -464,5 +464,5 @@ func copyDataBasedOnIndexFile(srcDatName, srcIdxName, dstDatName, datIdxName str newNm.SaveToIdx(datIdxName) - return + return nil } |