Skip to content

Commit

Permalink
serf: add reap support
Browse files Browse the repository at this point in the history
  • Loading branch information
travisjeffery committed May 28, 2018
1 parent fa80ea7 commit 983857e
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
3 changes: 2 additions & 1 deletion jocko/leader.go
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,8 @@ func (b *Broker) reconcileMember(m serf.Member) error {
err = b.handleAliveMember(m)
case serf.StatusFailed:
err = b.handleFailedMember(m)
case StatusReap:
err = b.handleReapMember(m)
case serf.StatusLeft:
err = b.handleLeftMember(m)
}
Expand Down Expand Up @@ -420,7 +422,6 @@ func (b *Broker) handleFailedMember(m serf.Member) error {
},
},
}

if _, err := b.raftApply(structs.RegisterNodeRequestType, &req); err != nil {
return err
}
Expand Down
13 changes: 13 additions & 0 deletions jocko/serf.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ import (
"github.com/travisjeffery/jocko/log"
)

const (
// StatusReap is used to update the status of a node if we
// are handling a EventMemberReap
StatusReap = serf.MemberStatus(-1)
)

func (b *Broker) setupSerf(config *serf.Config, ch chan serf.Event, path string) (*serf.Serf, error) {
config.Init()
config.NodeName = b.config.NodeName
Expand Down Expand Up @@ -46,6 +52,8 @@ func (b *Broker) lanEventHandler() {
case serf.EventMemberJoin:
b.lanNodeJoin(e.(serf.MemberEvent))
b.localMemberEvent(e.(serf.MemberEvent))
case serf.EventMemberReap:
b.localMemberEvent(e.(serf.MemberEvent))
case serf.EventMemberLeave, serf.EventMemberFailed:
b.lanNodeFailed(e.(serf.MemberEvent))
b.localMemberEvent(e.(serf.MemberEvent))
Expand Down Expand Up @@ -88,7 +96,12 @@ func (b *Broker) localMemberEvent(me serf.MemberEvent) {
return
}

isReap := me.EventType() == serf.EventMemberReap

for _, m := range me.Members {
if isReap {
m.Status = StatusReap
}
select {
case b.reconcileCh <- m:
default:
Expand Down

0 comments on commit 983857e

Please sign in to comment.