mirror of
https://github.com/chrislusf/seaweedfs
synced 2024-06-26 12:29:37 +02:00
avoid unexpected compact size (#5272)
https://github.com/seaweedfs/seaweedfs/issues/5215
This commit is contained in:
parent
7c45992c79
commit
7187346cc1
|
@ -423,7 +423,10 @@ func (v *Volume) copyDataBasedOnIndexFile(srcDatName, srcIdxName, dstDatName, da
|
||||||
if dstDatBackend, err = backend.CreateVolumeFile(dstDatName, preallocate, 0); err != nil {
|
if dstDatBackend, err = backend.CreateVolumeFile(dstDatName, preallocate, 0); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
defer dstDatBackend.Close()
|
defer func() {
|
||||||
|
dstDatBackend.Sync()
|
||||||
|
dstDatBackend.Close()
|
||||||
|
}()
|
||||||
|
|
||||||
oldNm := needle_map.NewMemDb()
|
oldNm := needle_map.NewMemDb()
|
||||||
defer oldNm.Close()
|
defer oldNm.Close()
|
||||||
|
@ -484,7 +487,20 @@ func (v *Volume) copyDataBasedOnIndexFile(srcDatName, srcIdxName, dstDatName, da
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
dstDatSize, _, err := dstDatBackend.GetStat()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if v.nm.ContentSize() > v.nm.DeletedSize() {
|
||||||
|
expectedContentSize := v.nm.ContentSize() - v.nm.DeletedSize()
|
||||||
|
if expectedContentSize > uint64(dstDatSize) {
|
||||||
|
return fmt.Errorf("volume %s unexpected new data size: %d does not match size of content minus deleted: %d",
|
||||||
|
v.Id.String(), dstDatSize, expectedContentSize)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
glog.Warningf("volume %s content size: %d less deleted size: %d, new size: %d",
|
||||||
|
v.Id.String(), v.nm.ContentSize(), v.nm.DeletedSize(), dstDatSize)
|
||||||
|
}
|
||||||
err = newNm.SaveToIdx(datIdxName)
|
err = newNm.SaveToIdx(datIdxName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
|
Loading…
Reference in a new issue