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): optimize the calculation of datanode decommission progress

Browse Source 
Signed-off-by: chihe <chihe@oppo.com>
This commit is contained in:
chihe 2024-07-09 15:04:44 +08:00 committed by AmazingChi
parent 0ffe25c31d
commit d479a79f73
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
master/api_service.go
View File

@ -7119,6 +7119,9 @@ func (m *Server) cancelDecommissionDisk(w http.ResponseWriter, r *http.Request)
sendErrReply(w, r, &proto.HTTPReply{Code: proto.ErrCodeParamError, Msg: ret})
return
}
// remove from decommissioned disk
m.cluster.deleteAndSyncDecommissionedDisk(dataNode, diskPath)
rstMsg := fmt.Sprintf("cancel decommission disk[%s] successfully ", key)
sendOkReply(w, r, newSuccessHTTPReply(rstMsg))
}

25
master/data_node.go
View File

@ -443,26 +443,25 @@ func (dataNode *DataNode) updateDecommissionStatus(c *Cluster, debug bool) (uint
dataNode.SetDecommissionStatus(markDecommission)
return markDecommission, float64(0)
}
if successDiskNum == totalDisk {
dataNode.SetDecommissionStatus(DecommissionSuccess)
return DecommissionSuccess, float64(1)
if successDiskNum+failedDiskNum+cancelDiskNum == totalDisk {
if successDiskNum == totalDisk {
dataNode.SetDecommissionStatus(DecommissionSuccess)
return DecommissionSuccess, float64(1)
}
if cancelDiskNum != 0 {
dataNode.SetDecommissionStatus(DecommissionCancel)
} else {
dataNode.SetDecommissionStatus(DecommissionFail)
}
}
if failedDiskNum == totalDisk {
dataNode.SetDecommissionStatus(DecommissionFail)
return DecommissionFail, progress
}
if cancelDiskNum != 0 {
dataNode.SetDecommissionStatus(DecommissionCancel)
}
if debug {
log.LogInfof("action[updateDecommissionStatus] dataNode[%v] progress[%v] DecommissionDiskNum[%v] "+
"DecommissionDisks %v markDiskNum[%v] successDiskNum[%v] failedDiskNum[%v] cancelDiskNum[%v]",
dataNode.Addr, progress, len(dataNode.DecommissionDiskList), dataNode.DecommissionDiskList, markDiskNum,
dataNode.Addr, progress/float64(totalDisk), len(dataNode.DecommissionDiskList), dataNode.DecommissionDiskList, markDiskNum,
successDiskNum, failedDiskNum, cancelDiskNum)
}
return dataNode.GetDecommissionStatus(), progress
return dataNode.GetDecommissionStatus(), progress / float64(totalDisk)
}
func (dataNode *DataNode) GetLatestDecommissionDataPartition(c *Cluster) (partitions []*DataPartition) {

2
master/disk_manager.go
View File

@ -238,6 +238,8 @@ func (c *Cluster) deleteAndSyncDecommissionedDisk(dataNode *DataNode, diskPath s
}
if err = c.syncUpdateDataNode(dataNode); err != nil {
dataNode.addDecommissionedDisk(diskPath)
log.LogWarnf("action[deleteAndSyncDecommissionedDisk]submit raft failed: %v, delete disks[%v], dataNode[%v]",
err, diskPath, dataNode.Addr)
return
}
log.LogInfof("action[deleteAndSyncDecommissionedDisk] finish, remaining decommissioned disks[%v], dataNode[%v]", dataNode.getDecommissionedDisks(), dataNode.Addr)