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

consul: Do not remove ourself as raft peer in Serf event handler

This commit is contained in:
Armon Dadgar 2015-01-20 16:13:54 -08:00
parent 7d6b271fa2
commit ea7a0134c8
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
consul/leader.go
View File

@ -469,9 +469,11 @@ func (s *Server) handleReapMember(member serf.Member) error {
// handleDeregisterMember is used to deregister a member of a given reason // handleDeregisterMember is used to deregister a member of a given reason
func (s *Server) handleDeregisterMember(reason string, member serf.Member) error { func (s *Server) handleDeregisterMember(reason string, member serf.Member) error {
state := s.fsm.State() state := s.fsm.State()
// Check if the node does not exists // Do not deregister ourself. This can only happen if the current leader
_, found, _ := state.GetNode(member.Name) // is leaving. Instead, we should allow a follower to take-over and
if !found { // deregister us later.
if member.Name == s.config.NodeName {
s.logger.Printf("[WARN] consul: deregistering self (%s) should be done by follower", s.config.NodeName)
return nil return nil
} }
@ -483,11 +485,9 @@ func (s *Server) handleDeregisterMember(reason string, member serf.Member) error
} }
} }
// Do not deregister ourself. This can only happen if the current leader // Check if the node does not exists
// is leaving. Instead, we should allow a follower to take-over and _, found, _ := state.GetNode(member.Name)
// deregister us later. if !found {
if member.Name == s.config.NodeName {
s.logger.Printf("[WARN] consul: deregistering self (%s) should be done by follower", s.config.NodeName)
return nil return nil
} }