fix conflicts

This commit is contained in:
Konstantin Lebedev
2022-04-07 18:52:13 +05:00
parent f5246b748d
commit 35bc67f030
2 changed files with 469 additions and 448 deletions

View File

@@ -334,10 +334,11 @@ func (ms *MasterServer) createSequencer(option *MasterOption) sequence.Sequencer
}
func (ms *MasterServer) OnPeerUpdate(update *master_pb.ClusterNodeUpdate) {
glog.V(2).Infof("OnPeerUpdate: %+v", update)
if update.NodeType != cluster.MasterType || ms.Topo.HashicorpRaft == nil {
return
}
glog.V(4).Infof("OnPeerUpdate: %+v", update)
peerAddress := pb.ServerAddress(update.Address)
peerName := string(peerAddress)
isLeader := ms.Topo.HashicorpRaft.State() == hashicorpRaft.Leader