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(master): fix possible deadlocks during dp decommission.

Browse Source 
close:#1000231787

Signed-off-by: shuqiang-zheng <zhengshuqiang@oppo.com>
This commit is contained in:
shuqiang-zheng 2025-07-16 10:57:22 +08:00 committed by zhumingze1108
parent 44cd11860e
commit 8f8d7d6f5a
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
master/data_partition.go
View File

@ -1684,9 +1684,17 @@ func (partition *DataPartition) getRetryTimesRecordByDiskPath(diskPath string) (
}
func (partition *DataPartition) deleteInvalidRetryTimesRecord() {
partition.DecommissionDiskRetryMapMutex.Lock()
defer partition.DecommissionDiskRetryMapMutex.Unlock()
for key := range partition.DecommissionDiskRetryMap {
partition.DecommissionDiskRetryMapMutex.RLock()
if len(partition.DecommissionDiskRetryMap) == 0 {
partition.DecommissionDiskRetryMapMutex.RUnlock()
return
}
diskRetryMap := make(map[string]int)
for disk, retryTimes := range partition.DecommissionDiskRetryMap {
diskRetryMap[disk] = retryTimes
}
partition.DecommissionDiskRetryMapMutex.RUnlock()
for key := range diskRetryMap {
arr := strings.Split(key, "_")
if len(arr) == 2 {
addr := arr[0]
@ -1695,7 +1703,9 @@ func (partition *DataPartition) deleteInvalidRetryTimesRecord() {
continue
}
}
partition.DecommissionDiskRetryMapMutex.Lock()
delete(partition.DecommissionDiskRetryMap, key)
partition.DecommissionDiskRetryMapMutex.Unlock()
}
}