gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

use the full ServerAddress as the identifier

Browse source
This commit is contained in:
Konstantin Lebedev 2022-04-11 10:44:44 +05:00
parent 104ea7b029
commit d2fe0fae33
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
weed/server/raft_hashicorp.go
View file

@ -46,7 +46,7 @@ func (s *RaftServer) AddPeersConfiguration() (cfg raft.Configuration) {
for _, peer := range s.peers { for _, peer := range s.peers {
cfg.Servers = append(cfg.Servers, raft.Server{ cfg.Servers = append(cfg.Servers, raft.Server{
Suffrage: raft.Voter, Suffrage: raft.Voter,
ID: raft.ServerID(peer.String()), ID: raft.ServerID(peer),
Address: raft.ServerAddress(peer.ToGrpcAddress()), Address: raft.ServerAddress(peer.ToGrpcAddress()),
}) })
} }
@ -67,12 +67,13 @@ func (s *RaftServer) UpdatePeers() {
existsPeerName[string(server.ID)] = true existsPeerName[string(server.ID)] = true
} }
for _, peer := range s.peers { for _, peer := range s.peers {
if peer.String() == peerLeader || existsPeerName[peer.String()] { peerName := string(peer)
if peerName == peerLeader || existsPeerName[peerName] {
continue continue
} }
glog.V(0).Infof("adding new peer: %s", peer.String()) glog.V(0).Infof("adding new peer: %s", peerName)
s.RaftHashicorp.AddVoter( s.RaftHashicorp.AddVoter(
raft.ServerID(peer.String()), raft.ServerAddress(peer.ToGrpcAddress()), 0, 0) raft.ServerID(peerName), raft.ServerAddress(peer.ToGrpcAddress()), 0, 0)
} }
for peer, _ := range existsPeerName { for peer, _ := range existsPeerName {
if _, found := s.peers[peer]; !found { if _, found := s.peers[peer]; !found {