luxolus/open-consul
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

Use the new raft api function for leaving if applicable

Browse source
This commit is contained in:
Kyle Havlovitz 2017-03-27 12:31:38 -07:00
parent b7207b1733
commit c7c2ebaf24
No known key found for this signature in database
GPG key ID: 8A5E6B173056AD6C
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
consul/server.go
View file

@ -678,19 +678,29 @@ func (s *Server) Leave() error {
return err return err
} }
// TODO (slackpad) - This will need to be updated once we support node
// IDs.
addr := s.raftTransport.LocalAddr() addr := s.raftTransport.LocalAddr()
// If we are the current leader, and we have any other peers (cluster has multiple // If we are the current leader, and we have any other peers (cluster has multiple
// servers), we should do a RemovePeer to safely reduce the quorum size. If we are // servers), we should do a RemoveServer/RemovePeer to safely reduce the quorum size.
// not the leader, then we should issue our leave intention and wait to be removed // If we are not the leader, then we should issue our leave intention and wait to be
// for some sane period of time. // removed for some sane period of time.
isLeader := s.IsLeader() isLeader := s.IsLeader()
if isLeader && numPeers > 1 { if isLeader && numPeers > 1 {
future := s.raft.RemovePeer(addr) minRaftProtocol, err := ServerMinRaftProtocol(s.serfLAN.Members())
if err := future.Error(); err != nil { if err != nil {
s.logger.Printf("[ERR] consul: failed to remove ourself as raft peer: %v", err) return err
}
if minRaftProtocol >= 2 && s.config.RaftConfig.ProtocolVersion >= 3 {
future := s.raft.RemoveServer(raft.ServerID(s.config.NodeID), 0, 0)
if err := future.Error(); err != nil {
s.logger.Printf("[ERR] consul: failed to remove ourself as raft peer: %v", err)
}
} else {
future := s.raft.RemovePeer(addr)
if err := future.Error(); err != nil {
s.logger.Printf("[ERR] consul: failed to remove ourself as raft peer: %v", err)
}
} }
} }