Witnesses should only receive committed entries.

Summary: as title Reviewed By: fnabulsi Differential Revision: D70017788 fbshipit-source-id: 9b2203dc44ee6f1f134f5c6ad7104c8e57201aea
WhatsApp · Feb 22, 2025 · defdaec · defdaec
1 parent 00f6b13
commit defdaec
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/wa_raft_log_catchup.erl b/src/wa_raft_log_catchup.erl
@@ -271,7 +271,7 @@ send_logs_impl(#raft_identity{node = PeerNode} = Peer, NextLogIndex, LeaderTerm,
             {ok, E} = wa_raft_log:get(Log, NextLogIndex, LogBatchEntries, LogBatchBytes),
             E;
         true ->
-            {ok, T} = wa_raft_log:get_terms(Log, NextLogIndex, LogBatchEntries),
+            {ok, T} = wa_raft_log:get_terms(Log, NextLogIndex, min(LogBatchEntries, max(0, LeaderCommitIndex - NextLogIndex + 1))),
             [{Term, []} || Term <- T]
     end,
 

diff --git a/src/wa_raft_server.erl b/src/wa_raft_server.erl
@@ -2348,7 +2348,7 @@ heartbeat(?IDENTITY_REQUIRES_MIGRATION(_, FollowerId) = Sender,
             Entries =
                 case lists:member({Name, FollowerId}, Witnesses) of
                     true ->
-                        MaxWitnessLogEntries = ?RAFT_HEARTBEAT_MAX_ENTRIES_TO_WITNESS(App),
+                        MaxWitnessLogEntries = min(?RAFT_HEARTBEAT_MAX_ENTRIES_TO_WITNESS(App), max(0, CommitIndex - FollowerNextIndex + 1)),
                         {ok, Terms} = wa_raft_log:get_terms(View, FollowerNextIndex, MaxWitnessLogEntries),
                         [{Term, []} || Term <- Terms];
                     _ ->