gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

idx file sync before compaction

Browse source
This commit is contained in:
Chris Lu 2020-03-20 23:38:46 -07:00
parent 3505b06023
commit cbfe31a9a8
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
weed/storage/needle_map.go
View file

@ -30,6 +30,7 @@ type NeedleMapper interface {
DeletedCount() int DeletedCount() int
MaxFileKey() NeedleId MaxFileKey() NeedleId
IndexFileSize() uint64 IndexFileSize() uint64
Sync() error
} }
type baseNeedleMapper struct { type baseNeedleMapper struct {
@ -59,3 +60,7 @@ func (nm *baseNeedleMapper) appendToIndexFile(key NeedleId, offset Offset, size
_, err := nm.indexFile.Write(bytes) _, err := nm.indexFile.Write(bytes)
return err return err
} }
func (nm *baseNeedleMapper) Sync() error {
return nm.indexFile.Sync()
}

11
weed/storage/volume_vacuum.go
View file

@ -56,6 +56,9 @@ func (v *Volume) Compact(preallocate int64, compactionBytePerSecond int64) error
if err := v.DataBackend.Sync(); err != nil { if err := v.DataBackend.Sync(); err != nil {
glog.V(0).Infof("compact fail to sync volume %d", v.Id) glog.V(0).Infof("compact fail to sync volume %d", v.Id)
} }
if err := v.nm.Sync(); err != nil {
glog.V(0).Infof("compact fail to sync volume idx %d", v.Id)
}
return v.copyDataAndGenerateIndexFile(filePath+".cpd", filePath+".cpx", preallocate, compactionBytePerSecond) return v.copyDataAndGenerateIndexFile(filePath+".cpd", filePath+".cpx", preallocate, compactionBytePerSecond)
} }
@ -77,7 +80,10 @@ func (v *Volume) Compact2(preallocate int64, compactionBytePerSecond int64) erro
v.lastCompactRevision = v.SuperBlock.CompactionRevision v.lastCompactRevision = v.SuperBlock.CompactionRevision
glog.V(3).Infof("creating copies for volume %d ...", v.Id) glog.V(3).Infof("creating copies for volume %d ...", v.Id)
if err := v.DataBackend.Sync(); err != nil { if err := v.DataBackend.Sync(); err != nil {
glog.V(0).Infof("compact2 fail to sync volume %d", v.Id) glog.V(0).Infof("compact2 fail to sync volume dat %d", v.Id)
}
if err := v.nm.Sync(); err != nil {
glog.V(0).Infof("compact2 fail to sync volume idx %d", v.Id)
} }
return copyDataBasedOnIndexFile(filePath+".dat", filePath+".idx", filePath+".cpd", filePath+".cpx", v.SuperBlock, v.Version(), preallocate, compactionBytePerSecond) return copyDataBasedOnIndexFile(filePath+".dat", filePath+".idx", filePath+".cpd", filePath+".cpx", v.SuperBlock, v.Version(), preallocate, compactionBytePerSecond)
} }
@ -99,9 +105,6 @@ func (v *Volume) CommitCompact() error {
glog.V(3).Infof("Got volume %d committing lock...", v.Id) glog.V(3).Infof("Got volume %d committing lock...", v.Id)
v.nm.Close() v.nm.Close()
if v.DataBackend != nil { if v.DataBackend != nil {
if err := v.DataBackend.Sync(); err != nil {
glog.V(0).Infof("fail to sync volume %d", v.Id)
}
if err := v.DataBackend.Close(); err != nil { if err := v.DataBackend.Close(); err != nil {
glog.V(0).Infof("fail to close volume %d", v.Id) glog.V(0).Infof("fail to close volume %d", v.Id)
} }