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

Purge left nodes along with dead ones (#253) #254

Merged
merged 6 commits into from
Jan 12, 2022
+23 −4
Merged

Purge left nodes along with dead ones (#253) #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7227901
Purge left nodes along with dead ones (#253)
bwaters Jan 5, 2022
b2a65c5
Update util.go
bwaters Jan 10, 2022
4f63255
Update util.go
bwaters Jan 10, 2022
4b5c90b
Update TestMoveDeadNodes for StateLeft
bwaters Jan 10, 2022
faf068f
go fmt
bwaters Jan 10, 2022
8a17ff1
fix syntax
bwaters Jan 12, 2022
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
4 changes: 2 additions & 2 deletions util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,13 @@ func pushPullScale(interval time.Duration, n int) time.Duration {
return time.Duration(multiplier) * interval
}

// moveDeadNodes moves nodes that are dead and beyond the gossip to the dead interval
// moveDeadNodes moves dead and left nodes that that have not changed during the gossipToTheDeadTime interval
// to the end of the slice and returns the index of the first moved node.
func moveDeadNodes(nodes []*nodeState, gossipToTheDeadTime time.Duration) int {
numDead := 0
n := len(nodes)
for i := 0; i < n-numDead; i++ {
if nodes[i].State != StateDead {
if !nodes[i].DeadOrLeft() {
continue
}

Expand Down
23 changes: 21 additions & 2 deletions util_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,16 @@ func TestMoveDeadNodes(t *testing.T) {
State: StateDead,
StateChange: time.Now().Add(-10 * time.Second),
},
// This left node should not be moved, as its state changed
// less than the specified GossipToTheDead time ago
&nodeState{
State: StateLeft,
StateChange: time.Now().Add(-10 * time.Second),
},
&nodeState{
State: StateLeft,
StateChange: time.Now().Add(-20 * time.Second),
},
&nodeState{
State: StateAlive,
StateChange: time.Now().Add(-20 * time.Second),
Expand All @@ -190,10 +200,14 @@ func TestMoveDeadNodes(t *testing.T) {
State: StateAlive,
StateChange: time.Now().Add(-20 * time.Second),
},
&nodeState{
State: StateLeft,
StateChange: time.Now().Add(-20 * time.Second),
},
}

idx := moveDeadNodes(nodes, (15 * time.Second))
if idx != 4 {
if idx != 5 {
t.Fatalf("bad index")
}
for i := 0; i < idx; i++ {
Expand All @@ -204,14 +218,19 @@ func TestMoveDeadNodes(t *testing.T) {
if nodes[i].State != StateDead {
t.Fatalf("Bad state %d", i)
}
case 3:
//Recently left node should remain at 3
if nodes[i].State != StateLeft {
t.Fatalf("Bad State %d", i)
}
default:
if nodes[i].State != StateAlive {
t.Fatalf("Bad state %d", i)
}
}
}
for i := idx; i < len(nodes); i++ {
if nodes[i].State != StateDead {
if !nodes[i].DeadOrLeft() {
t.Fatalf("Bad state %d", i)
}
}
Expand Down