Merge pull request #555 from rabbitmq/mk-backport-553-to-v2.15.x

2.15.x: backport #553 (66de28e)

Author: michaelklishin

Makefile

@@ -21,6 +21,7 @@ LOCAL_DEPS = sasl crypto
 dep_elvis_mk = git https://github.com/inaka/elvis.mk.git master
 dep_looking_glass = git https://github.com/rabbitmq/looking-glass.git master
 dep_inet_tcp_proxy = git https://github.com/rabbitmq/inet_tcp_proxy.git
+dep_eunit_formatters = git https://github.com/seancribbs/eunit_formatters main
 
 DEP_PLUGINS = elvis_mk
 

src/ra_server.erl

@@ -1109,7 +1109,8 @@ handle_follower(#append_entries_rpc{term = Term,
                                    " including ~b entries did not validate local log. "
                                    "Local last index ~b",
                                    [LogId, PLIdx, length(Entries0), LocalLastIdx]),
-                            {LVTerm, State2} = fetch_term(LastValidatedIdx, State0),
+                            {LVTerm, State2} = fetch_term(LastValidatedIdx,
+                                                          State0#{log => Log2}),
                             Reply = #append_entries_reply{term = CurTerm,
                                                           success = true,
                                                           next_index = LastValidatedIdx + 1,
@@ -1162,7 +1163,8 @@ handle_follower(#append_entries_rpc{term = Term,
                                    transition_to => follower}}},
              Effects};
         {term_mismatch, OtherTerm, Log0} ->
-            LastApplied = maps:get(last_applied, State00),
+            State1 = State0#{log => Log0},
+            LastApplied = maps:get(last_applied, State1),
             ?INFO("~ts: term mismatch - follower had entry at ~b with term ~b "
                   "but not with term ~b~n"
                   "Asking leader ~w to resend from ~b",
@@ -1177,11 +1179,10 @@ handle_follower(#append_entries_rpc{term = Term,
             % This _may_ overwrite some valid entries but is probably the
             % simplest and most reliable way to proceed
             {Reply, State2} = mismatch_append_entries_reply(Term, LastApplied,
-                                                           State0),
+                                                            State1),
             Effects = [cast_reply(Id, LeaderId, Reply) | Effects0],
             {await_condition,
-             State2#{log => Log0,
-                    condition =>
+             State2#{condition =>
                     #{predicate_fun => follower_catchup_cond_fun(term_mismatch),
                       % repeat reply effect on condition timeout
                       timeout => #{effects => Effects,