gian/cubefs
1
0
Fork 0
mirror of https://github.com/cubefs/cubefs.git synced 2026-08-02 02:00:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(data): load extents consider snapshot

Browse Source 
Signed-off-by: NaturalSelect <huangzhibin1@oppo.com>
This commit is contained in:
NaturalSelect 2024-05-23 16:31:35 +08:00 committed by longerfly
parent d0352cc55c
commit 025d2ff89c
1 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
storage/extent_store.go
View File

@ -61,6 +61,7 @@ const (
NormalExtentDeleteRetainTime = 3600 * 4
CacheFlushInterval = 5 * time.Second
ExtentReadDirHint = "READDIR_HINT"
ExtentReadDirHintV2 = "READDIR_HINT_V2"
ExtentReadDirHintTemp = "READDIR_HINT.tmp"
StaleExtStoreBackupSuffix = ".old"
@ -389,13 +390,14 @@ func (s *ExtentStore) GetExtentInfoFromDisk(id uint64) (ei *ExtentInfo, err erro
ino := stat.Sys().(*syscall.Stat_t)
ei = &ExtentInfo{
FileID: id,
Size: uint64(stat.Size()),
Crc: 0,
IsDeleted: false,
AccessTime: time.Unix(int64(ino.Atim.Sec), int64(ino.Atim.Nsec)).Unix(),
ModifyTime: stat.ModTime().Unix(),
Source: "",
FileID: id,
Size: uint64(stat.Size()),
Crc: 0,
IsDeleted: false,
AccessTime: time.Unix(int64(ino.Atim.Sec), int64(ino.Atim.Nsec)).Unix(),
ModifyTime: stat.ModTime().Unix(),
Source: "",
SnapshotDataOff: util.ExtentSize,
}
if IsTinyExtent(id) {
watermark := ei.Size
@ -404,6 +406,10 @@ func (s *ExtentStore) GetExtentInfoFromDisk(id uint64) (ei *ExtentInfo, err erro
}
ei.Size = watermark
}
// NOTE: init snapshot offset
if stat.Size() > int64(ei.SnapshotDataOff) {
ei.SnapshotDataOff = uint64(stat.Size())
}
return
}
return
@ -456,7 +462,7 @@ func (s *ExtentStore) writeReadDirHint() (err error) {
}()
hintTempPath := path.Join(s.dataPath, ExtentReadDirHintTemp)
hintPath := path.Join(s.dataPath, ExtentReadDirHint)
hintPath := path.Join(s.dataPath, ExtentReadDirHintV2)
buff := bytes.NewBuffer([]byte{})
err = s.RangeExtentInfo(func(id uint64, ei *ExtentInfo) (ok bool, err error) {
err = ei.MarshalBinaryWithBuffer(buff)
@ -497,7 +503,7 @@ func (s *ExtentStore) readReadDirHint() (extMap map[uint64]*ExtentInfo, err erro
log.LogInfof("[readReadDirHint] store(%v) read hint file using time(%v), read size(%v), cnt(%v), slow(%v)", s.dataPath, time.Since(begin), size, cnt, slow)
}()
hintPath := path.Join(s.dataPath, ExtentReadDirHint)
hintPath := path.Join(s.dataPath, ExtentReadDirHintV2)
data, err = os.ReadFile(hintPath)
if err != nil {
if os.IsNotExist(err) {
@ -522,14 +528,25 @@ func (s *ExtentStore) readReadDirHint() (extMap map[uint64]*ExtentInfo, err erro
}
func (s *ExtentStore) removeReadDirHint() (err error) {
hintPath := path.Join(s.dataPath, ExtentReadDirHint)
hintPath := path.Join(s.dataPath, ExtentReadDirHintV2)
err = os.Remove(hintPath)
if err != nil {
if os.IsNotExist(err) {
err = nil
return
}
log.LogErrorf("[removeReadDirHint] store(%v) failed to remove read dir hint, err(%v)", s.dataPath, err)
log.LogErrorf("[removeReadDirHint] store(%v) failed to remove read dir hint(%v), err(%v)", s.dataPath, hintPath, err)
return
}
// NOTE: delete old version
hintPath = path.Join(s.dataPath, ExtentReadDirHint)
err = os.Remove(hintPath)
if err != nil {
if os.IsNotExist(err) {
err = nil
return
}
log.LogErrorf("[removeReadDirHint] store(%v) failed to remove read dir hint(%v), err(%v)", s.dataPath, hintPath, err)
return
}
return
@ -1022,8 +1039,11 @@ func (s *ExtentStore) GetStoreUsedSize() (used int64) {
tinyTotal += uint64(size)
} else {
// NOTE: for debug
size := int64(einfo.Size + (einfo.SnapshotDataOff - util.ExtentSize))
size := int64(einfo.TotalSize())
if log.EnableDebug() {
if size < 0 {
log.LogErrorf("[GetStoreUsedSize] store(%v) extent(%v) size(%v) is < 0, extent size(%v) snap off(%v)", s.dataPath, einfo.FileID, size, einfo.Size, einfo.SnapshotDataOff)
}
actualSize, err := s.getFileDiskUsed(path.Join(s.dataPath, strconv.FormatInt(int64(einfo.FileID), 10)))
if err != nil {
log.LogErrorf("[GetStoreUsedSize] store(%v) failed to get normal extent(%v) disk used", s.dataPath, einfo.FileID)