Fixing issue with aliveMsg replay

Author: armon

state.go

@@ -3,12 +3,13 @@ package memberlist
 import (
 	"bytes"
 	"fmt"
-	"github.com/armon/go-metrics"
 	"math"
 	"math/rand"
 	"net"
 	"sync/atomic"
 	"time"
+
+	"github.com/armon/go-metrics"
 )
 
 type nodeStateType int
@@ -277,6 +278,7 @@ func (m *Memberlist) resetNodes() {
 
 	// Deregister the dead nodes
 	for i := deadIdx; i < len(m.nodes); i++ {
+		delete(m.nodeMap, m.nodes[i].Name)
 		m.nodes[i] = nil
 	}
 
@@ -855,9 +857,6 @@ func (m *Memberlist) deadNode(d *dead) {
 	state.State = stateDead
 	state.StateChange = time.Now()
 
-	// Remove from the node map
-	delete(m.nodeMap, state.Name)
-
 	// Notify of death
 	if m.config.Events != nil {
 		m.config.Events.NotifyLeave(&state.Node)

state_test.go

@@ -712,6 +712,24 @@ func TestMemberList_DeadNode_OldDead(t *testing.T) {
 	}
 }
 
+func TestMemberList_DeadNode_AliveReplay(t *testing.T) {
+	m := GetMemberlist(t)
+	a := alive{Node: "test", Addr: []byte{127, 0, 0, 1}, Incarnation: 10}
+	m.aliveNode(&a, nil, false)
+
+	d := dead{Node: "test", Incarnation: 10}
+	m.deadNode(&d)
+
+	// Replay alive at same incarnation
+	m.aliveNode(&a, nil, false)
+
+	// Should remain dead
+	state, ok := m.nodeMap["test"]
+	if ok && state.State != stateDead {
+		t.Fatalf("Bad state")
+	}
+}
+
 func TestMemberList_DeadNode_Refute(t *testing.T) {
 	m := GetMemberlist(t)
 	a := alive{Node: m.config.Name, Addr: []byte{127, 0, 0, 1}, Incarnation: 1}