diff --git a/raft/testdata/confchange_v1_add_single.txt b/raft/testdata/confchange_v1_add_single.txt index d9cc1a7b1..cd07af479 100644 --- a/raft/testdata/confchange_v1_add_single.txt +++ b/raft/testdata/confchange_v1_add_single.txt @@ -35,10 +35,13 @@ stabilize > 1 handling Ready Ready MustSync=true: Lead:1 State:StateLeader - HardState Term:1 Vote:1 Commit:4 + HardState Term:1 Vote:1 Commit:2 Entries: 1/3 EntryNormal "" 1/4 EntryConfChange v2 +> 1 handling Ready + Ready MustSync=false: + HardState Term:1 Vote:1 Commit:4 CommittedEntries: 1/3 EntryNormal "" 1/4 EntryConfChange v2 diff --git a/raft/testdata/confchange_v2_add_double_auto.txt b/raft/testdata/confchange_v2_add_double_auto.txt index 0a5e205bf..2419083f0 100644 --- a/raft/testdata/confchange_v2_add_double_auto.txt +++ b/raft/testdata/confchange_v2_add_double_auto.txt @@ -31,19 +31,24 @@ INFO 3 switched to configuration voters=() INFO 3 became follower at term 0 INFO newRaft 3 [peers: [], term: 0, commit: 0, applied: 0, lastindex: 0, lastterm: 0] -# n1 immediately gets to commit & apply the conf change using only itself. We see that -# it starts transitioning out of that joint configuration (though we will only see that -# proposal in the next ready handling loop, when it is emitted). We also see that this -# is using joint consensus, which it has to since we're carrying out two additions at -# once. +# Process n1 once, so that it can append the entry. process-ready 1 ---- Ready MustSync=true: Lead:1 State:StateLeader -HardState Term:1 Vote:1 Commit:4 +HardState Term:1 Vote:1 Commit:2 Entries: 1/3 EntryNormal "" 1/4 EntryConfChangeV2 v2 v3 + +# Now n1 applies the conf change. We see that it starts transitioning out of that joint +# configuration (though we will only see that proposal in the next ready handling +# loop, when it is emitted). We also see that this is using joint consensus, which +# it has to since we're carrying out two additions at once. +process-ready 1 +---- +Ready MustSync=false: +HardState Term:1 Vote:1 Commit:4 CommittedEntries: 1/3 EntryNormal "" 1/4 EntryConfChangeV2 v2 v3 diff --git a/raft/testdata/confchange_v2_add_double_implicit.txt b/raft/testdata/confchange_v2_add_double_implicit.txt index a93eb81cb..45dfc5099 100644 --- a/raft/testdata/confchange_v2_add_double_implicit.txt +++ b/raft/testdata/confchange_v2_add_double_implicit.txt @@ -38,10 +38,13 @@ stabilize 1 2 > 1 handling Ready Ready MustSync=true: Lead:1 State:StateLeader - HardState Term:1 Vote:1 Commit:4 + HardState Term:1 Vote:1 Commit:2 Entries: 1/3 EntryNormal "" 1/4 EntryConfChangeV2 v2 +> 1 handling Ready + Ready MustSync=false: + HardState Term:1 Vote:1 Commit:4 CommittedEntries: 1/3 EntryNormal "" 1/4 EntryConfChangeV2 v2 diff --git a/raft/testdata/confchange_v2_add_single_auto.txt b/raft/testdata/confchange_v2_add_single_auto.txt index 47c7f10b8..7ee3ab6c3 100644 --- a/raft/testdata/confchange_v2_add_single_auto.txt +++ b/raft/testdata/confchange_v2_add_single_auto.txt @@ -36,10 +36,13 @@ stabilize > 1 handling Ready Ready MustSync=true: Lead:1 State:StateLeader - HardState Term:1 Vote:1 Commit:4 + HardState Term:1 Vote:1 Commit:2 Entries: 1/3 EntryNormal "" 1/4 EntryConfChangeV2 v2 +> 1 handling Ready + Ready MustSync=false: + HardState Term:1 Vote:1 Commit:4 CommittedEntries: 1/3 EntryNormal "" 1/4 EntryConfChangeV2 v2 diff --git a/raft/testdata/confchange_v2_add_single_explicit.txt b/raft/testdata/confchange_v2_add_single_explicit.txt index dd4a4f654..b4e6e3a83 100644 --- a/raft/testdata/confchange_v2_add_single_explicit.txt +++ b/raft/testdata/confchange_v2_add_single_explicit.txt @@ -36,10 +36,13 @@ stabilize 1 2 > 1 handling Ready Ready MustSync=true: Lead:1 State:StateLeader - HardState Term:1 Vote:1 Commit:4 + HardState Term:1 Vote:1 Commit:2 Entries: 1/3 EntryNormal "" 1/4 EntryConfChangeV2 v2 +> 1 handling Ready + Ready MustSync=false: + HardState Term:1 Vote:1 Commit:4 CommittedEntries: 1/3 EntryNormal "" 1/4 EntryConfChangeV2 v2 diff --git a/raft/testdata/snapshot_succeed_via_app_resp.txt b/raft/testdata/snapshot_succeed_via_app_resp.txt index 96ded532c..dbbd5ce11 100644 --- a/raft/testdata/snapshot_succeed_via_app_resp.txt +++ b/raft/testdata/snapshot_succeed_via_app_resp.txt @@ -41,7 +41,7 @@ ok status 1 ---- -1: StateReplicate match=11 next=12 inactive +1: StateReplicate match=11 next=12 2: StateReplicate match=11 next=12 3: StateProbe match=0 next=11 paused inactive @@ -95,7 +95,7 @@ stabilize 1 status 1 ---- -1: StateReplicate match=11 next=12 inactive +1: StateReplicate match=11 next=12 2: StateReplicate match=11 next=12 3: StateSnapshot match=0 next=11 paused pendingSnap=11 @@ -132,7 +132,7 @@ stabilize 1 status 1 ---- -1: StateReplicate match=11 next=12 inactive +1: StateReplicate match=11 next=12 2: StateReplicate match=11 next=12 3: StateReplicate match=11 next=12