Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

raft/rafttest: fix stabilize handler

Browse Source 
It was bailing out too early.
This commit is contained in:
Tobias Schottdorf 2019-08-14 17:24:14 +02:00
parent d047fe84ee
commit c2d9514370
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
raft/rafttest/interaction_env_handler_stabilize.go
View File

@ -73,12 +73,12 @@ func (env *InteractionEnv) Stabilize(idxs ...int) error {
withIndent(func() { env.DeliverMsgs(msgs) }) withIndent(func() { env.DeliverMsgs(msgs) })
done = false done = false
} }
}
if done { if done {
return nil return nil
} }
} }
} }
}
func splitMsgs(msgs []raftpb.Message, to uint64) (toMsgs []raftpb.Message, rmdr []raftpb.Message) { func splitMsgs(msgs []raftpb.Message, to uint64) (toMsgs []raftpb.Message, rmdr []raftpb.Message) {
for _, msg := range msgs { for _, msg := range msgs {

17
raft/testdata/snapshot_succeed_via_app_resp.txt vendored
View File

@ -136,6 +136,21 @@ status 1
2: StateReplicate match=11 next=12 2: StateReplicate match=11 next=12
3: StateReplicate match=11 next=12 3: StateReplicate match=11 next=12
# Let things settle.
stabilize stabilize
---- ----
ok > delivering messages
1->2 MsgHeartbeat Term:1 Log:0/0 Commit:11
> delivering messages
1->3 MsgApp Term:1 Log:1/11 Commit:11
> 2 handling Ready
Ready MustSync=false:
Messages:
2->1 MsgHeartbeatResp Term:1 Log:0/0
> 3 handling Ready
Ready MustSync=false:
Messages:
3->1 MsgAppResp Term:1 Log:0/11
> delivering messages
2->1 MsgHeartbeatResp Term:1 Log:0/0
3->1 MsgAppResp Term:1 Log:0/11