Browse Source
Merge pull request #2697 from guo-sj/fix_bugs_in_return_value
pull/2700/head
Chris Lu
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
3 additions and
3 deletions
-
weed/storage/volume_vacuum.go
|
|
|
@ -370,7 +370,7 @@ func (v *Volume) copyDataAndGenerateIndexFile(dstName, idxName string, prealloca |
|
|
|
dst backend.BackendStorageFile |
|
|
|
) |
|
|
|
if dst, err = backend.CreateVolumeFile(dstName, preallocate, 0); err != nil { |
|
|
|
return |
|
|
|
return err |
|
|
|
} |
|
|
|
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) |
|
|
|
if err != nil { |
|
|
|
return nil |
|
|
|
return err |
|
|
|
} |
|
|
|
|
|
|
|
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) { |
|
|
|
|
