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): remove the status of DecommissionNeedManualFix

Browse Source 
Signed-off-by: chihe <chihe@oppo.com>
This commit is contained in:
chihe 2024-06-14 18:44:19 +08:00 committed by longerfly
parent 3325185e75
commit e9f4b5ab7e
4 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
master/data_node.go
View File

@ -405,10 +405,6 @@ func (dataNode *DataNode) updateDecommissionStatus(c *Cluster, debug bool) (uint
failedNum++
failedPartitionIds = append(failedPartitionIds, dp.PartitionID)
}
if dp.GetDecommissionStatus() == DecommissionNeedManualFix {
failedNum++
failedPartitionIds = append(failedPartitionIds, dp.PartitionID)
}
if dp.GetDecommissionStatus() == DecommissionRunning {
runningNum++
runningPartitionIds = append(runningPartitionIds, dp.PartitionID)
@ -473,7 +469,7 @@ func (dataNode *DataNode) GetDecommissionFailedDPByTerm(c *Cluster) []proto.Fail
partitions := dataNode.GetLatestDecommissionDataPartition(c)
log.LogDebugf("action[GetDecommissionDataNodeFailedDP] partitions len %v", len(partitions))
for _, dp := range partitions {
if dp.IsRollbackFailed() || dp.GetDecommissionStatus() == DecommissionNeedManualFix {
if dp.IsRollbackFailed() {
failedDps = append(failedDps, proto.FailedDpInfo{PartitionID: dp.PartitionID, ErrMsg: dp.DecommissionErrorMessage})
log.LogWarnf("action[GetDecommissionDataNodeFailedDP] dp[%v] failed", dp.PartitionID)
}

11
master/data_partition.go
View File

@ -978,8 +978,6 @@ func GetDecommissionStatusMessage(status uint32) string {
return "Success"
case DecommissionFail:
return "Failed"
case DecommissionNeedManualFix:
return "DecommissionNeedManualFix"
case DecommissionPrepare:
return "DecommissionPrepare"
default:
@ -1050,9 +1048,6 @@ func (partition *DataPartition) MarkDecommissionStatus(srcAddr, dstAddr, srcDisk
if partition.IsDiscard {
goto directly
}
if partition.needManualFix() {
return proto.ErrAllReplicaUnavailable
}
// TODO-chi:can delete this block
// 1 or 2 replica can always add new replica if retrying decommission
// for 3 replica,
@ -1081,7 +1076,6 @@ func (partition *DataPartition) MarkDecommissionStatus(srcAddr, dstAddr, srcDisk
if partition.getReplicaDiskErrorNum() == partition.ReplicaNum {
log.LogWarnf("action[MarkDecommissionStatus] dp[%v] all replica is unavaliable, cannot handle in auto decommission mode",
partition.PartitionID)
partition.SetDecommissionStatus(DecommissionNeedManualFix)
partition.DecommissionErrorMessage = "all replica is unavailable, cannot handle in auto decommission mode"
return proto.ErrAllReplicaUnavailable
}
@ -1121,7 +1115,6 @@ func (partition *DataPartition) MarkDecommissionStatus(srcAddr, dstAddr, srcDisk
if partition.getReplicaDiskErrorNum() == partition.ReplicaNum {
log.LogWarnf("action[MarkDecommissionStatus] dp[%v] all replica is unavaliable, cannot handle in manual decommission mode",
partition.PartitionID)
partition.SetDecommissionStatus(DecommissionNeedManualFix)
partition.DecommissionErrorMessage = "all replica is unavailable, cannot handle in manual decommission mode"
return proto.ErrAllReplicaUnavailable
}
@ -1972,10 +1965,6 @@ func (partition *DataPartition) getDiskErrorReplica() *DataReplica {
return nil
}
func (partition *DataPartition) needManualFix() bool {
return partition.GetDecommissionStatus() == DecommissionNeedManualFix
}
func (partition *DataPartition) checkReplicaMeta(c *Cluster) (err error) {
var auditMsg string

7
master/disk_manager.go
View File

@ -351,11 +351,6 @@ func (dd *DecommissionDisk) updateDecommissionStatus(c *Cluster, debug bool) (ui
failedPartitionIds = append(failedPartitionIds, dp.PartitionID)
}
if dp.GetDecommissionStatus() == DecommissionNeedManualFix {
failedNum++
failedPartitionIds = append(failedPartitionIds, dp.PartitionID)
}
if dp.GetDecommissionStatus() == DecommissionRunning {
runningNum++
runningPartitionIds = append(runningPartitionIds, dp.PartitionID)
@ -427,7 +422,7 @@ func (dd *DecommissionDisk) GetDecommissionFailedDPByTerm(c *Cluster) []proto.Fa
var failedDps []proto.FailedDpInfo
log.LogDebugf("action[GetDecommissionFailedDPByTerm] partitions len %v", len(partitions))
for _, dp := range partitions {
if dp.IsRollbackFailed() || dp.GetDecommissionStatus() == DecommissionNeedManualFix {
if dp.IsRollbackFailed() {
failedDps = append(failedDps, proto.FailedDpInfo{PartitionID: dp.PartitionID, ErrMsg: dp.DecommissionErrorMessage})
log.LogWarnf("action[GetDecommissionFailedDPByTerm] dp[%v] failed", dp.PartitionID)
}

1
proto/admin_proto.go
View File

@ -47,6 +47,7 @@ const (
AdminQueryDataPartitionDecommissionStatus = "/dataPartition/queryDecommissionStatus"
AdminCheckReplicaMeta = "/dataPartition/checkReplicaMeta"
AdminRecoverReplicaMeta = "/dataPartition/recoverReplicaMeta"
AdminRecoverDiskErrorReplica = "/dataPartition/recoverDiskErrorReplica"
AdminDeleteDataReplica = "/dataReplica/delete"
AdminAddDataReplica = "/dataReplica/add"
AdminDeleteVol = "/vol/delete"