Don't print log if not match

Cjen1 · Dec 30, 2023 · d0b5393 · d0b5393
1 parent fbf6bf8
commit d0b5393
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/impl/test/test_paxos.ml b/impl/test/test_paxos.ml
@@ -99,6 +99,7 @@ let%expect_test "request vote from higher" =
     actions ;
   [%expect
     {|
+    +Follower for node 2 for term 10
     +Follower for term 10
     t': {log: []; commit_index:-1; current_term: 10; node_state:Follower(5)}
     actions:
@@ -114,6 +115,7 @@ let%expect_test "request vote from higher" =
   [%expect
     {|
     +Candidate for term 3
+    +Follower for node 2 for term 10
     +Follower for term 10
     t': {log: []; commit_index:-1; current_term: 10; node_state:Follower(5)}
     actions:
@@ -131,6 +133,7 @@ let%expect_test "request vote from higher" =
     {|
     +Candidate for term 3
     +Leader for term 3
+    +Follower for node 2 for term 10
     +Follower for term 10
     t': {log: []; commit_index:-1; current_term: 10; node_state:Follower(5)}
     actions:
@@ -156,6 +159,7 @@ let%expect_test "Loop" =
   let t, _ = Impl.advance t Tick in
   Fmt.pr "node_state: %a\n" PP.node_state_pp (A.get node_state t) ;
   [%expect {|
+    +Follower for node 2 for term 10
     +Follower for term 10
     node_state: Follower(1) |}] ;
   let t, actions = Impl.advance t Tick in
@@ -175,6 +179,7 @@ let%expect_test "Loop" =
   Fmt.pr "a1: %a\n" Fmt.(brackets @@ list ~sep:(const string "\n") action_pp) a1 ;
   [%expect
     {|
+    +Follower for node 2 for term 12
     +Follower for term 12
     a1: [Send(2,RequestVoteResponse {term:12; start_index:0; entries_length:0; entries:
            []})] |}] ;
@@ -183,6 +188,7 @@ let%expect_test "Loop" =
   Fmt.pr "a2: %a\n" Fmt.(brackets @@ list ~sep:(const string "\n") action_pp) a2 ;
   [%expect
     {|
+    +Follower for node 2 for term 12
     +Follower for term 12
     a2: [Send(2,RequestVoteResponse {term:12; start_index:0; entries_length:0; entries:
            []})] |}] ;
@@ -196,6 +202,7 @@ let%expect_test "Loop" =
     actions ;
   [%expect
     {|
+    +Received vote from 1
     +Leader for term 12
     actions: [Send(1,AppendEntries {term: 12; leader_commit: -1; prev_log_index: -1; prev_log_term: 0; entries_length: 0; entries:
                 []})
@@ -309,6 +316,7 @@ let%expect_test "Loop" =
   pp_res t2 actions ;
   [%expect
     {|
+    +Follower for node 1 for term 13
     +Follower for term 13
     t: {log: [{command: Command(Read m1, 1); term : 12}]; commit_index:-1; current_term: 13; node_state:Follower(5)}
     actions:
@@ -324,6 +332,7 @@ let%expect_test "Loop" =
   pp_res t1 actions ;
   [%expect
     {|
+    +Received vote from 2
     +Leader for term 13
     t: {log: [{command: Command(Read m1, 1); term : 13}]; commit_index:-1; current_term: 13; node_state:Leader{heartbeat:1; rep_ackd:
     [{0, -1}, {2, -1}]; rep_sent:[{0, 0}, {2, 0}]}
@@ -397,6 +406,7 @@ let%expect_test "Loop" =
   pp_res t actions ;
   [%expect
     {|
+    +Follower for node 2 for term 14
     +Follower for term 14
     t: {log: [{command: Command(Read m1, 1); term : 12},{command: Command(Read m2, 2); term : 12}]; commit_index:0; current_term: 14; node_state:Follower(5)}
     actions:
@@ -415,6 +425,7 @@ let%expect_test "Loop" =
   pp_res t2 actions ;
   [%expect
     {|
+    +Received vote from 0
     +Leader for term 14
     t: {log: [{command: Command(Read m1, 1); term : 14},{command: Command(Read m4, 3); term : 14}]; commit_index:-1; current_term: 14; node_state:Leader{heartbeat:1; rep_ackd:
     [{0, -1}, {1, -1}]; rep_sent:[{0, 1}, {1, 1}]}
@@ -446,8 +457,11 @@ let%expect_test "Loop" =
   Fmt.pr "t2:\n%a\n" PP.t_pp t2 ;
   [%expect
     {|
+    +Follower for node 1 for term 100
     +Follower for term 100
+    +Follower for node 2 for term 100
     +Follower for term 100
+    +Follower for node 2 for term 100
     +Follower for term 100
     t0:
     {log: [{command: Command(Read m1, 1); term : 12},{command: Command(Read m2, 2); term : 12}]; commit_index:0; current_term: 100; node_state:Follower(5)}
@@ -510,6 +524,7 @@ let%expect_test "Loop" =
   pp_res t actions ;
   [%expect
     {|
+    +Received vote from 1
     +Leader for term 102
     t: {log: [{command: Command(Read m1, 1); term : 12},{command: Command(Read m4, 3); term : 102},{command: Command(Read m5, 4); term : 102},{command: Command(Read m6, 5); term : 102}]; commit_index:0; current_term: 102; node_state:Leader{heartbeat:1; rep_ackd:
     [{1, -1}, {2, -1}]; rep_sent:[{1, 3}, {2, 3}]}
@@ -535,6 +550,7 @@ let%expect_test "Loop" =
   pp_res t1 actions ;
   [%expect
     {|
+    +Received vote from 2
     +Leader for term 103
     t: {log: [{command: Command(Read m1, 1); term : 13},{command: Command(Read m4, 3); term : 13},{command: Command(Read m7, 6); term : 103},{command: Command(Read m6, 5); term : 103}]; commit_index:1; current_term: 103; node_state:Leader{heartbeat:1; rep_ackd:
     [{0, -1}, {2, -1}]; rep_sent:[{0, 3}, {2, 3}]}
@@ -560,6 +576,7 @@ let%expect_test "Loop" =
   pp_res t2 actions ;
   [%expect
     {|
+    +Received vote from 0
     +Leader for term 101
     t: {log: [{command: Command(Read m1, 1); term : 101},{command: Command(Read m4, 3); term : 101},{command: Command(Read m7, 6); term : 101}]; commit_index:-1; current_term: 101; node_state:Leader{heartbeat:1; rep_ackd:
     [{0, -1}, {1, -1}]; rep_sent:[{0, 2}, {1, 2}]}
@@ -593,9 +610,12 @@ let%expect_test "Missing elements" =
   pp_res t actions ;
   [%expect
     {|
+    +Follower for node 2 for term 10
     +Follower for term 10
     +Candidate for term 12
+    +Follower for node 2 for term 12
     +Follower for term 12
+    +Received vote from 1
     +Leader for term 12
     t: {log: []; commit_index:-1; current_term: 12; node_state:Leader{heartbeat:1; rep_ackd:
     [{1, -1}, {2, -1}]; rep_sent:[{1, -1}, {2, -1}]}
@@ -639,8 +659,7 @@ let%expect_test "Missing elements" =
     {|
     +Failed to match
     +rooted_at_start(false), matching_index_and_term(false):
-    +{log:
-    +[]; commit_index:-1; current_term: 12; node_state:Follower(5)}
+    +
     t: {log: []; commit_index:-1; current_term: 12; node_state:Follower(5)}
     actions:
     [Send(0,AppendEntriesResponse {term: 12; success: Error: -1})] |}] ;
@@ -649,9 +668,6 @@ let%expect_test "Missing elements" =
   pp_res t actions ;
   [%expect
     {|
-    +Failed to match
-    +{log: [{command: Command(Read m1, 1); term : 12},{command: Command(Read m2, 2); term : 12}]; commit_index:-1; current_term: 12; node_state:Leader{heartbeat:1; rep_ackd:
-    +[{1, -1}, {2, -1}]; rep_sent:[{1, -1}, {2, 1}]}
     t: {log: [{command: Command(Read m1, 1); term : 12},{command: Command(Read m2, 2); term : 12}]; commit_index:-1; current_term: 12; node_state:Leader{heartbeat:1; rep_ackd:
     [{1, -1}, {2, -1}]; rep_sent:[{1, 1}, {2, 1}]}
     actions: [Send(1,AppendEntries {term: 12; leader_commit: -1; prev_log_index: -1; prev_log_term: 0; entries_length: 2; entries:

diff --git a/impl/test/test_raft.ml b/impl/test/test_raft.ml
@@ -630,8 +630,7 @@ let%expect_test "Missing elements" =
     {|
     +Failed to match
     +rooted_at_start(false), matching_index_and_term(false):
-    +{log:
-    +[]; commit_index:-1; current_term: 11; node_state:Follower{timeout:5; voted_for:0}}
+    +
     t: {log: []; commit_index:-1; current_term: 11; node_state:Follower{timeout:5; voted_for:0}}
     actions:
     [Send(0,AppendEntriesResponse {term: 11; success: Error: -1})] |}] ;
@@ -640,9 +639,6 @@ let%expect_test "Missing elements" =
   pp_res t actions ;
   [%expect
     {|
-    +Failed to match
-    +{log: [{command: Command(NoOp, -1); term : 11},{command: Command(Read m1, 1); term : 11},{command: Command(Read m2, 2); term : 11}]; commit_index:-1; current_term: 11; node_state:Leader{heartbeat:1; rep_ackd:
-    +[{1, -1}, {2, -1}]; rep_sent:[{1, -1}, {2, 2}]}
     t: {log: [{command: Command(NoOp, -1); term : 11},{command: Command(Read m1, 1); term : 11},{command: Command(Read m2, 2); term : 11}]; commit_index:-1; current_term: 11; node_state:Leader{heartbeat:1; rep_ackd:
     [{1, -1}, {2, -1}]; rep_sent:[{1, 2}, {2, 2}]}
     actions: [Send(1,AppendEntries {term: 11; leader_commit: -1; prev_log_index: -1; prev_log_term: 0; entries_length: 3; entries: