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

feat(datanode): evict the extent cache by ttl.#1000005968

Browse Source 
Signed-off-by: Wu Huocheng <wuhuocheng@oppo.com>
This commit is contained in:
Wu Huocheng 2025-04-17 17:39:04 +08:00 committed by zhumingze1108
parent 167e4c488a
commit 30b29217a1
7 changed files with 82 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
datanode/partition.go
View File

@ -1743,3 +1743,10 @@ func (dp *DataPartition) setChangeMemberWaiting() bool {
func (dp *DataPartition) setRestoreReplicaFinish() bool {
return atomic.CompareAndSwapUint32(&dp.responseStatus, responseWait, responseInitial)
}
func (dp *DataPartition) EvictExtentCache() {
err := dp.extentStore.DoExtentCacheTtl(dp.dataNode.ExtentCacheTtlByHour)
if err != nil {
log.LogWarnf("[EvictExtentCache] DoExtentCacheTtl err: %s", err.Error())
}
}

8
datanode/server.go
View File

@ -71,6 +71,7 @@ const (
DefaultDiskUnavailableErrorCount = 5
DefaultDiskUnavailablePartitionErrorCount = 3
DefaultGOGCValue = 100
DefaultExtentCacheTtlByHour = 1
)
const (
@ -136,6 +137,7 @@ const (
// disk status becomes unavailable if disk error partition count reaches this value
ConfigKeyDiskUnavailablePartitionErrorCount = "diskUnavailablePartitionErrorCount"
ConfigKeyCacheCap = "cacheCap"
ConfigExtentCacheTtlByHour = "extentCacheTtlByHour"
// storage device media type, for hybrid cloud, in string: SDD or HDD
ConfigMediaType = "mediaType"
@ -220,6 +222,7 @@ type DataNode struct {
nodeForbidWriteOpOfProtoVer0 bool // whether forbid by node granularity,
VolsForbidWriteOpOfProtoVer0 map[string]struct{} // whether forbid by volume granularity,
DirectReadVols map[string]struct{}
ExtentCacheTtlByHour int
}
type verOp2Phase struct {
@ -474,6 +477,8 @@ func (s *DataNode) parseConfig(cfg *config.Config) (err error) {
}
s.mediaType = mediaType
s.ExtentCacheTtlByHour = cfg.GetIntWithDefault(ConfigExtentCacheTtlByHour, DefaultExtentCacheTtlByHour)
log.LogDebugf("action[parseConfig] load masterAddrs(%v).", MasterClient.Nodes())
log.LogDebugf("action[parseConfig] load port(%v).", s.port)
log.LogDebugf("action[parseConfig] load zoneName(%v).", s.zoneName)
@ -666,6 +671,9 @@ func (s *DataNode) startSpaceManager(cfg *config.Config) (err error) {
s.space.StartDiskSample()
s.updateQosLimit() // load from config
s.markAllDiskLoaded()
go s.space.StartEvictExtentCache()
return nil
}

17
datanode/space_manager.go
View File

@ -960,3 +960,20 @@ func (manager *SpaceManager) getPartitions() []*DataPartition {
}
return partitions
}
func (manager *SpaceManager) StartEvictExtentCache() {
ticker := time.NewTicker(time.Hour)
defer ticker.Stop()
for {
select {
case <-ticker.C:
partitions := manager.getPartitions()
for _, partition := range partitions {
partition.EvictExtentCache()
}
case <-manager.stopC:
return
}
}
}

11
datanode/stat_log.go
View File

@ -15,12 +15,17 @@ import (
func (d *DataNode) startStat(cfg *config.Config) {
logDir := cfg.GetString(ConfigKeyLogDir)
var err error
var logLeftSpaceLimitRatio float64
logLeftSpaceLimitRatioStr := cfg.GetString("logLeftSpaceLimitRatio")
logLeftSpaceLimitRatio, err := strconv.ParseFloat(logLeftSpaceLimitRatioStr, 64)
if err != nil {
log.LogWarnf("get log limt ratio failed, err %s", err.Error())
if logLeftSpaceLimitRatioStr == "" {
logLeftSpaceLimitRatio = log.DefaultLogLeftSpaceLimitRatio
} else {
logLeftSpaceLimitRatio, err = strconv.ParseFloat(logLeftSpaceLimitRatioStr, 64)
if err != nil {
log.LogWarnf("get log limt ratio failed, err %s", err.Error())
logLeftSpaceLimitRatio = log.DefaultLogLeftSpaceLimitRatio
}
}
stat.DpStat, err = stat.NewOpLogger(logDir, "dp_op.log", stat.DefaultMaxOps, stat.DefaultDuration, logLeftSpaceLimitRatio)

8
datanode/storage/extent.go
View File

@ -35,6 +35,7 @@ import (
"github.com/cubefs/cubefs/util"
"github.com/cubefs/cubefs/util/atomicutil"
"github.com/cubefs/cubefs/util/log"
"github.com/cubefs/cubefs/util/timeutil"
)
const (
@ -344,8 +345,8 @@ func (e *Extent) InitToFS() (err error) {
e.dataSize = 0
return
}
atomic.StoreInt64(&e.modifyTime, time.Now().Unix())
atomic.StoreInt64(&e.accessTime, time.Now().Unix())
atomic.StoreInt64(&e.modifyTime, timeutil.GetCurrentTimeUnix())
atomic.StoreInt64(&e.accessTime, timeutil.GetCurrentTimeUnix())
e.dataSize = 0
return
}
@ -451,8 +452,7 @@ func (e *Extent) RestoreFromFS() (err error) {
atomic.StoreInt64(&e.modifyTime, info.ModTime().Unix())
ts := info.Sys().(*syscall.Stat_t)
atomic.StoreInt64(&e.accessTime, time.Unix(int64(ts.Atim.Sec), int64(ts.Atim.Nsec)).Unix())
atomic.StoreInt64(&e.accessTime, timeutil.GetCurrentTimeUnix())
return
}

34
datanode/storage/extent_cache.go
View File

@ -17,9 +17,11 @@ package storage
import (
"container/list"
"sync"
"sync/atomic"
"time"
"github.com/cubefs/cubefs/util/log"
"github.com/cubefs/cubefs/util/timeutil"
)
const (
@ -91,6 +93,7 @@ func (cache *ExtentCache) Get(extentID uint64) (e *Extent, ok bool) {
cache.extentList.MoveToBack(item.element)
}
e = item.e
atomic.StoreInt64(&e.accessTime, timeutil.GetCurrentTimeUnix())
}
return
}
@ -219,3 +222,34 @@ func (cache *ExtentCache) Flush() {
item.e.Flush()
}
}
func (cache *ExtentCache) EvictTTL(ttl int) error {
cmpTime := timeutil.GetCurrentTimeUnix() - int64(ttl)*int64(time.Hour)
if cache.capacity <= 0 || cmpTime <= 0 {
return nil
}
cache.lock.Lock()
defer cache.lock.Unlock()
delList := make([]*list.Element, 0, cache.extentList.Len())
for e := cache.extentList.Front(); e != nil; e = e.Next() {
item := e.Value.(*Extent)
if IsTinyExtent(item.extentID) {
continue
}
if item.accessTime < cmpTime {
element := e
delList = append(delList, element)
delete(cache.extentMap, item.extentID)
item.Close()
}
}
for _, element := range delList {
cache.extentList.Remove(element)
}
return nil
}

4
datanode/storage/extent_store.go
View File

@ -1836,3 +1836,7 @@ func (s *ExtentStore) ExtentBatchUnlockNormalExtent(ext []*proto.ExtentKey) {
func (s *ExtentStore) GetExtentCountWithoutLock() (count int) {
return len(s.extentInfoMap)
}
func (s *ExtentStore) DoExtentCacheTtl(ttl int) error {
return s.cache.EvictTTL(ttl)
}