fix badkey

Author: kjnilsson

src/ra_seq.erl

@@ -71,22 +71,22 @@ floor(FloorIdxIncl, Seq) when is_list(Seq) ->
 
 
 -spec limit(ra:index(), state()) -> state().
-limit(CeilIdx, [Last | Rem])
+limit(CeilIdxIncl, [Last | Rem])
   when is_integer(Last) andalso
-       Last > CeilIdx ->
-    limit(CeilIdx, Rem);
-limit(CeilIdx, [{_, _} = T | Rem]) ->
-    case ra_range:limit(CeilIdx + 1, T) of
+       Last > CeilIdxIncl ->
+    limit(CeilIdxIncl, Rem);
+limit(CeilIdxIncl, [{_, _} = T | Rem]) ->
+    case ra_range:limit(CeilIdxIncl + 1, T) of
         undefined ->
-            limit(CeilIdx, Rem);
+            limit(CeilIdxIncl, Rem);
         {I, I} ->
             [I | Rem];
         {I, I2} when I == I2 - 1 ->
             [I2, I | Rem];
         NewRange ->
             [NewRange | Rem]
     end;
-limit(_CeilIdx, Seq) ->
+limit(_CeilIdxIncl, Seq) ->
     Seq.
 
 %% @doc adds two sequences together where To is

src/ra_server_proc.erl

@@ -329,8 +329,8 @@ do_init(#{id := Id,
     true = ets:insert(ra_state, {Key, init, unknown}),
     process_flag(trap_exit, true),
     Config = #{counter := Counter,
-               system_config := #{names := Names} = SysConf} = maps:merge(config_defaults(Id),
-                                                      Config0),
+               system_config := #{names := Names} = SysConf} =
+        maps:merge(config_defaults(Id), Config0),
     MsgQData = maps:get(message_queue_data, SysConf, off_heap),
     MinBinVheapSize = maps:get(server_min_bin_vheap_size, SysConf,
                                ?MIN_BIN_VHEAP_SIZE),

src/ra_snapshot.erl

@@ -549,7 +549,9 @@ complete_accept(Chunk, Num, Machine,
                            current = IdxTerm},
     {ok, #{machine_version := SnapMacVer}, MacState} = recover(State),
     SnapMacMod  = ra_machine:which_module(Machine, SnapMacVer),
-    LiveIndexes = ra_machine:live_indexes(SnapMacMod, MacState),
+    %% TODO: allow the ra machine to return a re_seq instead of a plain list
+    LiveIndexes = ra_seq:from_list(
+                    ra_machine:live_indexes(SnapMacMod, MacState)),
     SnapDir = make_snapshot_dir(Dir, Idx, Term),
     ok = write_indexes(SnapDir, LiveIndexes),
     %% delete accepting marker file

src/ra_worker.erl

@@ -8,6 +8,7 @@
 -module(ra_worker).
 -behaviour(gen_server).
 
+-include("ra.hrl").
 -export([start_link/1,
          queue_work/3]).
 
@@ -18,7 +19,8 @@
          terminate/2,
          code_change/3]).
 
--record(state, {}).
+-record(state, {log_id = "" :: unicode:chardata()
+               }).
 
 %%% ra worker responsible for doing background work for a ra server.
 %%%
@@ -39,9 +41,11 @@ queue_work(Pid, FunOrMfa, ErrFun) when is_pid(Pid) ->
 %%% gen_server callbacks
 %%%===================================================================
 
-init(Config) when is_map(Config) ->
+init(#{id := Id} = Config) when is_map(Config) ->
     process_flag(trap_exit, true),
-    {ok, #state{}}.
+    LogId = maps:get(friendly_name, Config,
+                     lists:flatten(io_lib:format("~w", [Id]))),
+    {ok, #state{log_id = LogId}}.
 
 handle_call(_, _From, State) ->
     {reply, ok, State}.
@@ -52,17 +56,19 @@ handle_cast({work, FunOrMfa, ErrFun}, State) ->
             try erlang:apply(M, F, Args) of
                 _ ->
                     ok
-            catch Type:Err:_Stack ->
-                      %% TODO: log
+            catch Type:Err:Stack ->
+                      ?WARN("~ts: worker encounted error ~0p of type ~s, Stack:~n~p",
+                            [State#state.log_id, Err, Type, Stack]),
                       ErrFun({Type, Err}),
                       ok
             end;
         _ when is_function(FunOrMfa) ->
             try FunOrMfa() of
                 _ ->
                     ok
-            catch Type:Err:_Stack ->
-                      %% TODO: log
+            catch Type:Err:Stack ->
+                      ?WARN("~ts: worker encounted error ~0p of type ~s, Stack:~n~p",
+                            [State#state.log_id, Err, Type, Stack]),
                       ErrFun({Type, Err})
             end,
             ok