Skip to content

Commit 4e3bb65

Browse files
committed
remove server from config before shutting down, fix raft submodule
1 parent d4cb80f commit 4e3bb65

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "raft-compat/raft-latest"]
22
path = raft-compat/raft-previous-version
3-
url = git@github.com:hashicorp/raft
3+
url = https://github.com/hashicorp/raft.git

raft-compat/prevote_test.go

+4
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ func TestRaft_PreVote_BootStrap_PreVote(t *testing.T) {
2020
utils.WaitFuture(t, f)
2121
}
2222
leaveNoTransfer := func(t *testing.T, cluster testcluster.RaftCluster, id string) {
23+
fr := cluster.GetLeader().GetRaft().(*raftprevious.Raft).RemoveServer(raftprevious.ServerID(id), 0, 0)
24+
utils.WaitFuture(t, fr)
2325
f := cluster.Raft(id).(*raftprevious.Raft).Shutdown()
2426
utils.WaitFuture(t, f)
2527
}
@@ -160,6 +162,8 @@ func TestRaft_PreVote_Rollback(t *testing.T) {
160162
utils.WaitFuture(t, f)
161163
}
162164
leaveNoTransfer := func(t *testing.T, cluster testcluster.RaftCluster, id string) {
165+
fr := cluster.GetLeader().GetRaft().(*raft.Raft).RemoveServer(raft.ServerID(id), 0, 0)
166+
utils.WaitFuture(t, fr)
163167
f := cluster.Raft(id).(*raft.Raft).Shutdown()
164168
utils.WaitFuture(t, f)
165169
}

0 commit comments

Comments
 (0)