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

[BugFix] release routine which has deleted expired partition successfully

Browse Source 
Signed-off-by: M1eyu2018 <857037797@qq.com>
This commit is contained in:
M1eyu2018 2023-03-24 18:35:27 +08:00 committed by leonrayang
parent 9dd4398a90
commit c67eef8ba1
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
datanode/disk.go
View File

@ -458,7 +458,7 @@ func (d *Disk) RestorePartition(visitor PartitionVisitor) {
if d.isExpiredPartitionDir(filename) {
name := path.Join(d.Path, filename)
toDeleteExpiredPartitionNames = append(toDeleteExpiredPartitionNames, name)
log.LogInfof("action[RestorePartition]: find expired partition on path(%s)", name)
log.LogInfof("action[RestorePartition] find expired partition on path(%s)", name)
}
continue
}
@ -503,8 +503,8 @@ func (d *Disk) RestorePartition(visitor PartitionVisitor) {
}(partitionID, filename)
}
log.LogInfof("action[RestorePartition] expiredPartitions %v", toDeleteExpiredPartitionNames)
if len(toDeleteExpiredPartitionNames) > 0 {
log.LogInfof("action[RestorePartition] expiredPartitions %v, disk %v", toDeleteExpiredPartitionNames, d.Path)
notDeletedExpiredPartitionNames := d.deleteExpiredPartitions(toDeleteExpiredPartitionNames)
@ -512,13 +512,12 @@ func (d *Disk) RestorePartition(visitor PartitionVisitor) {
go func(toDeleteExpiredPartitions []string) {
ticker := time.NewTicker(ExpiredPartitionExistTime)
log.LogInfof("action[RestorePartition] delete expiredPartitions automatically start, toDeleteExpiredPartitions %v", toDeleteExpiredPartitions)
for {
select {
case <-ticker.C:
d.deleteExpiredPartitions(toDeleteExpiredPartitionNames)
ticker.Stop()
log.LogInfof("action[RestorePartition] delete expiredPartitions automatically finish")
}
select {
case <-ticker.C:
d.deleteExpiredPartitions(toDeleteExpiredPartitionNames)
ticker.Stop()
log.LogInfof("action[RestorePartition] delete expiredPartitions automatically finish")
return
}
}(notDeletedExpiredPartitionNames)
}