gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2697 from guo-sj/fix_bugs_in_return_value

Browse Source
This commit is contained in:
Chris Lu
2022-02-23 00:30:52 -08:00
committed by GitHub
parent 8b806fb273 8f9aa0cddd
commit bd092d8318
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
weed/storage/volume_vacuum.go
View File

@@ -370,7 +370,7 @@ func (v *Volume) copyDataAndGenerateIndexFile(dstName, idxName string, prealloca
dst backend.BackendStorageFile dst backend.BackendStorageFile
) )
if dst, err = backend.CreateVolumeFile(dstName, preallocate, 0); err != nil { if dst, err = backend.CreateVolumeFile(dstName, preallocate, 0); err != nil {
return return err
} }
defer dst.Close() defer dst.Close()
@@ -386,11 +386,11 @@ func (v *Volume) copyDataAndGenerateIndexFile(dstName, idxName string, prealloca
} }
err = ScanVolumeFile(v.dir, v.Collection, v.Id, v.needleMapKind, scanner) err = ScanVolumeFile(v.dir, v.Collection, v.Id, v.needleMapKind, scanner)
if err != nil { if err != nil {
return nil return err
} }
err = nm.SaveToIdx(idxName) err = nm.SaveToIdx(idxName)
return return nil
} }
func copyDataBasedOnIndexFile(srcDatName, srcIdxName, dstDatName, datIdxName string, sb super_block.SuperBlock, version needle.Version, preallocate, compactionBytePerSecond int64, progressFn ProgressFunc) (err error) { func copyDataBasedOnIndexFile(srcDatName, srcIdxName, dstDatName, datIdxName string, sb super_block.SuperBlock, version needle.Version, preallocate, compactionBytePerSecond int64, progressFn ProgressFunc) (err error) {