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): select another meta node as leader.#1000218883

Browse Source 
Signed-off-by: Wu Huocheng <wuhuocheng@oppo.com>
This commit is contained in:
Wu Huocheng 2025-07-08 16:04:54 +08:00 committed by zhumingze1108
parent 22a6f7928a
commit 8df607c853
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
master/cluster_balance.go
View File

@ -1615,6 +1615,7 @@ func convertStructToJson(low map[string]*proto.ZonePressureView) string {
}
func (c *Cluster) changeAndCheckMetaPartitionLeader(mrPlan *proto.MrBalanceInfo, mpPlan *proto.MetaBalancePlan, mp *MetaPartition) error {
var newLeader string
for i := 0; i < CheckMetaLeaderRetry; i++ {
leader, err := mp.getMetaReplicaLeader()
if err != nil {
@ -1628,7 +1629,7 @@ func (c *Cluster) changeAndCheckMetaPartitionLeader(mrPlan *proto.MrBalanceInfo,
}
// try to change leader.
newLeader := selectOneLeaderAddr(mrPlan, mpPlan, mp)
newLeader = selectOneLeaderAddr(mrPlan, mpPlan, mp, newLeader)
if newLeader == "" {
err = fmt.Errorf("selectOneLeaderAddr mp[%d] source: %s failed", mp.PartitionID, mrPlan.Source)
log.LogErrorf(err.Error())
@ -1646,10 +1647,10 @@ func (c *Cluster) changeAndCheckMetaPartitionLeader(mrPlan *proto.MrBalanceInfo,
log.LogErrorf("metapartition[%d] has no leader", mp.PartitionID)
return err
}
return fmt.Errorf("Try to change leader failed. leader: %s, migrate source: %s", leader.Addr, mrPlan.Source)
return fmt.Errorf("Try to change leader to %s failed. leader: %s, migrate source: %s", newLeader, leader.Addr, mrPlan.Source)
}
func selectOneLeaderAddr(mrPlan *proto.MrBalanceInfo, mpPlan *proto.MetaBalancePlan, mp *MetaPartition) string {
func selectOneLeaderAddr(mrPlan *proto.MrBalanceInfo, mpPlan *proto.MetaBalancePlan, mp *MetaPartition, leader string) string {
// Select one address which is not in the meta partition plan.
for _, replica := range mp.Replicas {
isSelected := true
@ -1659,14 +1660,14 @@ func selectOneLeaderAddr(mrPlan *proto.MrBalanceInfo, mpPlan *proto.MetaBalanceP
break
}
}
if isSelected {
if isSelected && replica.Addr != leader {
return replica.Addr
}
}
// Select one address which is not the current source address.
for _, replica := range mp.Replicas {
if mrPlan.Source != replica.Addr {
if mrPlan.Source != replica.Addr && replica.Addr != leader {
return replica.Addr
}
}

1
metanode/packet.go
View File

@ -125,5 +125,6 @@ func (p *Packet) AdminOp() bool {
return p.Opcode == proto.OpAddMetaPartitionRaftMember ||
p.Opcode == proto.OpRemoveMetaPartitionRaftMember ||
p.Opcode == proto.OpCreateMetaPartition ||
p.Opcode == proto.OpMetaPartitionTryToLeader ||
p.Opcode == proto.OpDeleteMetaPartition
}