umgeher/leveled
0
Fork 0
Code Issues Pull requests Releases Activity Actions

Trim dead branches

Browse source 
Also an experiment with altering the slowoffer_delay.
This commit is contained in:
Martin Sumner 2016-11-05 15:59:31 +00:00
parent a73c233154
commit a7ed3e4b85
2 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/leveled_bookie.erl
View file

@ -161,7 +161,7 @@
-define(LEDGER_FP, "ledger"). -define(LEDGER_FP, "ledger").
-define(SNAPSHOT_TIMEOUT, 300000). -define(SNAPSHOT_TIMEOUT, 300000).
-define(CHECKJOURNAL_PROB, 0.2). -define(CHECKJOURNAL_PROB, 0.2).
-define(SLOWOFFER_DELAY, 10). -define(SLOWOFFER_DELAY, 5).
-record(state, {inker :: pid(), -record(state, {inker :: pid(),
penciller :: pid(), penciller :: pid(),
@ -1185,4 +1185,4 @@ foldobjects_vs_hashtree_test() ->
reset_filestructure(). reset_filestructure().
-endif. -endif.

9
src/leveled_penciller.erl
View file

@ -16,7 +16,7 @@
%% may lose data but only in sequence from a particular sequence number. On %% may lose data but only in sequence from a particular sequence number. On
%% startup the Penciller will inform the Bookie of the highest sequence number %% startup the Penciller will inform the Bookie of the highest sequence number
%% it has, and the Bookie should load any missing data from that point out of %% it has, and the Bookie should load any missing data from that point out of
%5 the journal. %% the journal.
%% %%
%% -------- LEDGER --------- %% -------- LEDGER ---------
%% %%
@ -493,8 +493,7 @@ handle_cast({levelzero_complete, FN, StartKey, EndKey}, State) ->
persisted_sqn=State#state.ledger_sqn}}. persisted_sqn=State#state.ledger_sqn}}.
handle_info({_Ref, {ok, SrcFN, _StartKey, _EndKey}}, State) -> handle_info(_Info, State) ->
leveled_log:log("P0006", [SrcFN]),
{noreply, State}. {noreply, State}.
terminate(Reason, State=#state{is_snapshot=Snap}) when Snap == true -> terminate(Reason, State=#state{is_snapshot=Snap}) when Snap == true ->
@ -1201,8 +1200,6 @@ update_deletions([ClearedFile|Tail], MSN, UnreferencedFiles) ->
confirm_delete(Filename, UnreferencedFiles, RegisteredSnapshots) -> confirm_delete(Filename, UnreferencedFiles, RegisteredSnapshots) ->
case lists:keyfind(Filename, 1, UnreferencedFiles) of case lists:keyfind(Filename, 1, UnreferencedFiles) of
false ->
false;
{Filename, Pid, MSN} -> {Filename, Pid, MSN} ->
LowSQN = lists:foldl(fun({_, SQN}, MinSQN) -> min(SQN, MinSQN) end, LowSQN = lists:foldl(fun({_, SQN}, MinSQN) -> min(SQN, MinSQN) end,
infinity, infinity,
@ -1662,4 +1659,4 @@ checkready(Pid) ->
end. end.
-endif. -endif.