Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update ForceLeave Prune #580

Merged
merged 4 commits into from
Oct 2, 2019
Merged

Update ForceLeave Prune #580

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3a104b9
Fix forceleave prune
schristoff Sep 24, 2019
c9486b8
add handlePrune to left
schristoff Sep 24, 2019
0d3c0c6
added retry, added tests, fixed leaving
schristoff Sep 30, 2019
12f6332
cleaned up switch, removed alive test
schristoff Oct 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 18 additions & 11 deletions serf/serf.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1102,6 +1102,10 @@ func (s *Serf) handleNodeLeaveIntent(leaveMsg *messageLeave) bool {
case StatusAlive:
member.Status = StatusLeaving
member.statusLTime = leaveMsg.LTime

if leaveMsg.Prune {
s.handlePrune(member)
}
return true
case StatusFailed:
member.Status = StatusLeft
Expand All @@ -1127,26 +1131,29 @@ func (s *Serf) handleNodeLeaveIntent(leaveMsg *messageLeave) bool {
}

if leaveMsg.Prune {
s.logger.Printf("[INFO] serf: EventMemberReap (forced): %s %s", member.Name, member.Member.Addr)
s.leftMembers = removeOldMember(s.leftMembers, member.Name)
s.eraseNode(member)
s.handlePrune(member)
}

return true

case StatusLeft:
schristoff marked this conversation as resolved.
Show resolved Hide resolved
if leaveMsg.Prune {
s.logger.Printf("[INFO] serf: EventMemberReap (forced): %s %s", member.Name, member.Member.Addr)
s.leftMembers = removeOldMember(s.leftMembers, member.Name)
s.eraseNode(member)
}
return true

default:
return false
}
}

// handlePrune waits for nodes that are leaving and then forcibly
// erases a member from the list of members
func (s *Serf) handlePrune(member *memberState) {
if member.Status == StatusLeaving {
time.Sleep(s.config.BroadcastTimeout + s.config.LeavePropagateDelay)
}

s.logger.Printf("[INFO] serf: EventMemberReap (forced): %s %s", member.Name, member.Member.Addr)
s.leftMembers = removeOldMember(s.leftMembers, member.Name)
schristoff marked this conversation as resolved.
Show resolved Hide resolved
s.eraseNode(member)

}

// handleNodeJoinIntent is called when a node broadcasts a
// join message to set the lamport time of its join
func (s *Serf) handleNodeJoinIntent(joinMsg *messageJoin) bool {
Expand Down