tracker: add commit index to debug output

Signed-off-by: Pavel Kalinnikov <[email protected]>
etcd-io · Mar 4, 2024 · 5aaa1f1 · 5aaa1f1
1 parent be6c7ce
commit 5aaa1f1
Show file tree

Hide file tree

Showing 23 changed files with 174 additions and 173 deletions.
diff --git a/confchange/testdata/joint_autoleave.txt b/confchange/testdata/joint_autoleave.txt
@@ -5,16 +5,16 @@ simple
 v1
 ----
 voters=(1)
-1: StateProbe match=0 next=1
+1: StateProbe match=0 commit=0 next=1
 
 # Autoleave is reflected in the config.
 enter-joint autoleave=true
 v2 v3
 ----
 voters=(1 2 3)&&(1) autoleave
-1: StateProbe match=0 next=1
-2: StateProbe match=0 next=1
-3: StateProbe match=0 next=1
+1: StateProbe match=0 commit=0 next=1
+2: StateProbe match=0 commit=0 next=1
+3: StateProbe match=0 commit=0 next=1
 
 # Can't enter-joint twice, even if autoleave changes.
 enter-joint autoleave=false
@@ -24,6 +24,6 @@ config is already joint
 leave-joint
 ----
 voters=(1 2 3)
-1: StateProbe match=0 next=1
-2: StateProbe match=0 next=1
-3: StateProbe match=0 next=1
+1: StateProbe match=0 commit=0 next=1
+2: StateProbe match=0 commit=0 next=1
+3: StateProbe match=0 commit=0 next=1
diff --git a/confchange/testdata/joint_idempotency.txt b/confchange/testdata/joint_idempotency.txt
@@ -5,19 +5,19 @@ simple
 v1
 ----
 voters=(1)
-1: StateProbe match=0 next=1
+1: StateProbe match=0 commit=0 next=1
 
 enter-joint
 r1 r2 r9 v2 v3 v4 v2 v3 v4 l2 l2 r4 r4 l1 l1
 ----
 voters=(3)&&(1) learners=(2) learners_next=(1)
-1: StateProbe match=0 next=1
-2: StateProbe match=0 next=1 learner
-3: StateProbe match=0 next=1
+1: StateProbe match=0 commit=0 next=1
+2: StateProbe match=0 commit=0 next=1 learner
+3: StateProbe match=0 commit=0 next=1
 
 leave-joint
 ----
 voters=(3) learners=(1 2)
-1: StateProbe match=0 next=1 learner
-2: StateProbe match=0 next=1 learner
-3: StateProbe match=0 next=1
+1: StateProbe match=0 commit=0 next=1 learner
+2: StateProbe match=0 commit=0 next=1 learner
+3: StateProbe match=0 commit=0 next=1
diff --git a/confchange/testdata/joint_learners_next.txt b/confchange/testdata/joint_learners_next.txt
@@ -8,17 +8,17 @@ simple
 v1
 ----
 voters=(1)
-1: StateProbe match=0 next=1
+1: StateProbe match=0 commit=0 next=1
 
 enter-joint
 v2 l1
 ----
 voters=(2)&&(1) learners_next=(1)
-1: StateProbe match=0 next=1
-2: StateProbe match=0 next=1
+1: StateProbe match=0 commit=0 next=1
+2: StateProbe match=0 commit=0 next=1
 
 leave-joint
 ----
 voters=(2) learners=(1)
-1: StateProbe match=0 next=1 learner
-2: StateProbe match=0 next=1
+1: StateProbe match=0 commit=0 next=1 learner
+2: StateProbe match=0 commit=0 next=1
diff --git a/confchange/testdata/joint_safety.txt b/confchange/testdata/joint_safety.txt
@@ -15,7 +15,7 @@ simple
 v1
 ----
 voters=(1)
-1: StateProbe match=0 next=3
+1: StateProbe match=0 commit=0 next=3
 
 leave-joint
 ----
@@ -25,7 +25,7 @@ can't leave a non-joint config
 enter-joint
 ----
 voters=(1)&&(1)
-1: StateProbe match=0 next=3
+1: StateProbe match=0 commit=0 next=3
 
 enter-joint
 ----
@@ -34,7 +34,7 @@ config is already joint
 leave-joint
 ----
 voters=(1)
-1: StateProbe match=0 next=3
+1: StateProbe match=0 commit=0 next=3
 
 leave-joint
 ----
@@ -45,10 +45,10 @@ enter-joint
 r1 v2 v3 l4
 ----
 voters=(2 3)&&(1) learners=(4)
-1: StateProbe match=0 next=3
-2: StateProbe match=0 next=9
-3: StateProbe match=0 next=9
-4: StateProbe match=0 next=9 learner
+1: StateProbe match=0 commit=0 next=3
+2: StateProbe match=0 commit=0 next=9
+3: StateProbe match=0 commit=0 next=9
+4: StateProbe match=0 commit=0 next=9 learner
 
 enter-joint
 ----
@@ -67,15 +67,15 @@ can't apply simple config change in joint config
 leave-joint
 ----
 voters=(2 3) learners=(4)
-2: StateProbe match=0 next=9
-3: StateProbe match=0 next=9
-4: StateProbe match=0 next=9 learner
+2: StateProbe match=0 commit=0 next=9
+3: StateProbe match=0 commit=0 next=9
+4: StateProbe match=0 commit=0 next=9 learner
 
 simple
 l9
 ----
 voters=(2 3) learners=(4 9)
-2: StateProbe match=0 next=9
-3: StateProbe match=0 next=9
-4: StateProbe match=0 next=9 learner
-9: StateProbe match=0 next=14 learner
+2: StateProbe match=0 commit=0 next=9
+3: StateProbe match=0 commit=0 next=9
+4: StateProbe match=0 commit=0 next=9 learner
+9: StateProbe match=0 commit=0 next=14 learner
diff --git a/confchange/testdata/simple_idempotency.txt b/confchange/testdata/simple_idempotency.txt
@@ -2,68 +2,68 @@ simple
 v1
 ----
 voters=(1)
-1: StateProbe match=0 next=1
+1: StateProbe match=0 commit=0 next=1
 
 simple
 v1
 ----
 voters=(1)
-1: StateProbe match=0 next=1
+1: StateProbe match=0 commit=0 next=1
 
 simple
 v2
 ----
 voters=(1 2)
-1: StateProbe match=0 next=1
-2: StateProbe match=0 next=2
+1: StateProbe match=0 commit=0 next=1
+2: StateProbe match=0 commit=0 next=2
 
 simple
 l1
 ----
 voters=(2) learners=(1)
-1: StateProbe match=0 next=1 learner
-2: StateProbe match=0 next=2
+1: StateProbe match=0 commit=0 next=1 learner
+2: StateProbe match=0 commit=0 next=2
 
 simple
 l1
 ----
 voters=(2) learners=(1)
-1: StateProbe match=0 next=1 learner
-2: StateProbe match=0 next=2
+1: StateProbe match=0 commit=0 next=1 learner
+2: StateProbe match=0 commit=0 next=2
 
 simple
 r1
 ----
 voters=(2)
-2: StateProbe match=0 next=2
+2: StateProbe match=0 commit=0 next=2
 
 simple
 r1
 ----
 voters=(2)
-2: StateProbe match=0 next=2
+2: StateProbe match=0 commit=0 next=2
 
 simple
 v3
 ----
 voters=(2 3)
-2: StateProbe match=0 next=2
-3: StateProbe match=0 next=7
+2: StateProbe match=0 commit=0 next=2
+3: StateProbe match=0 commit=0 next=7
 
 simple
 r3
 ----
 voters=(2)
-2: StateProbe match=0 next=2
+2: StateProbe match=0 commit=0 next=2
 
 simple
 r3
 ----
 voters=(2)
-2: StateProbe match=0 next=2
+2: StateProbe match=0 commit=0 next=2
 
 simple
 r4
 ----
 voters=(2)
-2: StateProbe match=0 next=2
+2: StateProbe match=0 commit=0 next=2
diff --git a/confchange/testdata/simple_promote_demote.txt b/confchange/testdata/simple_promote_demote.txt
@@ -4,57 +4,57 @@ simple
 v1
 ----
 voters=(1)
-1: StateProbe match=0 next=1
+1: StateProbe match=0 commit=0 next=1
 
 simple
 v2
 ----
 voters=(1 2)
-1: StateProbe match=0 next=1
-2: StateProbe match=0 next=1
+1: StateProbe match=0 commit=0 next=1
+2: StateProbe match=0 commit=0 next=1
 
 simple
 v3
 ----
 voters=(1 2 3)
-1: StateProbe match=0 next=1
-2: StateProbe match=0 next=1
-3: StateProbe match=0 next=2
+1: StateProbe match=0 commit=0 next=1
+2: StateProbe match=0 commit=0 next=1
+3: StateProbe match=0 commit=0 next=2
 
 # Can atomically demote and promote without a hitch.
 # This is pointless, but possible.
 simple
 l1 v1
 ----
 voters=(1 2 3)
-1: StateProbe match=0 next=1
-2: StateProbe match=0 next=1
-3: StateProbe match=0 next=2
+1: StateProbe match=0 commit=0 next=1
+2: StateProbe match=0 commit=0 next=1
+3: StateProbe match=0 commit=0 next=2
 
 # Can demote a voter.
 simple
 l2
 ----
 voters=(1 3) learners=(2)
-1: StateProbe match=0 next=1
-2: StateProbe match=0 next=1 learner
-3: StateProbe match=0 next=2
+1: StateProbe match=0 commit=0 next=1
+2: StateProbe match=0 commit=0 next=1 learner
+3: StateProbe match=0 commit=0 next=2
 
 # Can atomically promote and demote the same voter.
 # This is pointless, but possible.
 simple
 v2 l2
 ----
 voters=(1 3) learners=(2)
-1: StateProbe match=0 next=1
-2: StateProbe match=0 next=1 learner
-3: StateProbe match=0 next=2
+1: StateProbe match=0 commit=0 next=1
+2: StateProbe match=0 commit=0 next=1 learner
+3: StateProbe match=0 commit=0 next=2
 
 # Can promote a voter.
 simple
 v2
 ----
 voters=(1 2 3)
-1: StateProbe match=0 next=1
-2: StateProbe match=0 next=1
-3: StateProbe match=0 next=2
+1: StateProbe match=0 commit=0 next=1
+2: StateProbe match=0 commit=0 next=1
+3: StateProbe match=0 commit=0 next=2
diff --git a/confchange/testdata/simple_safety.txt b/confchange/testdata/simple_safety.txt
@@ -7,15 +7,15 @@ simple
 v1
 ----
 voters=(1)
-1: StateProbe match=0 next=1
+1: StateProbe match=0 commit=0 next=1
 
 simple
 v2 l3
 ----
 voters=(1 2) learners=(3)
-1: StateProbe match=0 next=1
-2: StateProbe match=0 next=2
-3: StateProbe match=0 next=2 learner
+1: StateProbe match=0 commit=0 next=1
+2: StateProbe match=0 commit=0 next=2
+3: StateProbe match=0 commit=0 next=2 learner
 
 simple
 r1 v5
@@ -46,11 +46,11 @@ simple
 l2 l3 l4 l5
 ----
 voters=(1) learners=(2 3 4 5)
-1: StateProbe match=0 next=1
-2: StateProbe match=0 next=2 learner
-3: StateProbe match=0 next=2 learner
-4: StateProbe match=0 next=8 learner
-5: StateProbe match=0 next=8 learner
+1: StateProbe match=0 commit=0 next=1
+2: StateProbe match=0 commit=0 next=2 learner
+3: StateProbe match=0 commit=0 next=2 learner
+4: StateProbe match=0 commit=0 next=8 learner
+5: StateProbe match=0 commit=0 next=8 learner
 
 simple
 r1
@@ -61,4 +61,4 @@ simple
 r2 r3 r4 r5
 ----
 voters=(1)
-1: StateProbe match=0 next=1
+1: StateProbe match=0 commit=0 next=1
diff --git a/confchange/testdata/update.txt b/confchange/testdata/update.txt
@@ -6,18 +6,18 @@ simple
 v1
 ----
 voters=(1)
-1: StateProbe match=0 next=1
+1: StateProbe match=0 commit=0 next=1
 
 simple
 v2 u1
 ----
 voters=(1 2)
-1: StateProbe match=0 next=1
-2: StateProbe match=0 next=1
+1: StateProbe match=0 commit=0 next=1
+2: StateProbe match=0 commit=0 next=1
 
 simple
 u1 u2 u3 u1 u2 u3
 ----
 voters=(1 2)
-1: StateProbe match=0 next=1
-2: StateProbe match=0 next=1
+1: StateProbe match=0 commit=0 next=1
+2: StateProbe match=0 commit=0 next=1
diff --git a/confchange/testdata/zero.txt b/confchange/testdata/zero.txt
@@ -3,4 +3,4 @@ simple
 v1 r0 v0 l0
 ----
 voters=(1)
-1: StateProbe match=0 next=1
+1: StateProbe match=0 commit=0 next=1
diff --git a/testdata/campaign_learner_must_vote.txt b/testdata/campaign_learner_must_vote.txt
@@ -113,7 +113,7 @@ stabilize 2 3
 > 2 receiving messages
   3->2 MsgAppResp Term:2 Log:1/4 Rejected (Hint: 3)
   DEBUG 2 received MsgAppResp(rejected, hint: (index 3, term 1)) from 3 for index 4
-  DEBUG 2 decreased progress of 3 to [StateProbe match=0 next=4]
+  DEBUG 2 decreased progress of 3 to [StateProbe match=0 commit=0 next=4]
 > 2 handling Ready
   Ready MustSync=false:
   Messages: