fixes

Author: kjnilsson

src/ra_server.erl

@@ -444,11 +444,11 @@ recover(#{cfg := #cfg{log_id = LogId,
     {#{log := Log0,
        cfg := #cfg{effective_machine_version = EffMacVerAfter}} = State1, _} =
         apply_to(CommitIndex,
-                 fun({Idx, _, _} = E, S0) ->
+                 fun({_Idx, _, _} = E, S0) ->
                          %% Clear out the effects and notifies map
                          %% to avoid memory explosion
                          {Mod, LastAppl, S, MacSt, _E, _N, LastTs} = apply_with(E, S0),
-                         put_counter(Cfg, ?C_RA_SVR_METRIC_LAST_APPLIED, Idx),
+                         put_counter(Cfg, ?C_RA_SVR_METRIC_LAST_APPLIED, LastAppl),
                          {Mod, LastAppl, S, MacSt, [], #{}, LastTs}
                  end,
                  State0, []),
@@ -1582,10 +1582,13 @@ handle_receive_snapshot(#install_snapshot_rpc{term = Term,
             %% are of the right term
             {LastIdx, _} = ra_log:last_index_term(Log00),
             {Log, _} = lists:foldl(
-                       fun ({I, _, _} = E, {L0, LstIdx}) ->
-                               {ok, L} = ra_log:write_sparse(E, LstIdx, L0),
-                               {L, I}
-                       end, {Log00, LastIdx}, ChunkOrEntries),
+                         fun ({I, _, _} = E, {L0, LstIdx}) when I > LastApplied ->
+                                 {ok, L} = ra_log:write_sparse(E, LstIdx, L0),
+                                 {L, I};
+                             (_, Acc) ->
+                                 %% drop any entries that are lower than last applied
+                                 Acc
+                         end, {Log00, LastIdx}, ChunkOrEntries),
             State = update_term(Term, State0#{log => Log,
                                               snapshot_phase => pre}),
             {receive_snapshot, State, [{reply, Reply}]};

src/ra_server_proc.erl

@@ -1945,6 +1945,8 @@ send_snapshots(Id, Term, {_, ToNode} = To, ChunkSize,
                    [LogId, To, TheirMacVer, SnapMacVer]),
             ok;
         false ->
+            %% TODO: this could be stale, replace with a call into the
+            %% process insted perhaps?
             #{last_applied := LastApplied} = erpc:call(ToNode,
                                                        ra_counters,
                                                        counters,