greg/hanoidb
1
0
Fork 0
Code Issues 10 Pull requests 3 Projects Releases Packages Wiki Activity

level: Handle failure of merger process. Remove EXIT messages from inbox.

Browse source
This commit is contained in:
Erik Søe Sørensen 2012-01-05 17:50:18 +01:00
parent 0ff2a2528e
commit aca809aa90
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/fractal_btree_level.erl
View file

@ -211,9 +211,14 @@ main_loop(State = #state{ next=Next }) ->
{system, From, Req} ->
plain_fsm:handle_system_msg(
From, Req, State, fun(S1) -> main_loop(S1) end);
{'EXIT', Parent, Reason} ->
plain_fsm:parent_EXIT(Reason, State)
{'EXIT', Parent, Reason} ->
plain_fsm:parent_EXIT(Reason, State);
{'EXIT', _, normal} ->
%% Probably from a merger_pid - which we may have forgotten in the meantime.
main_loop(State);
{'EXIT', Pid, Reason} when Pid == State#state.merge_pid ->
restart_merge_then_loop(State#state{merge_pid=undefined}, Reason)
end.
do_lookup(_Key, []) ->
@ -236,6 +241,13 @@ stop_if_defined(undefined) -> ok;
stop_if_defined(MergePid) when is_pid(MergePid) ->
erlang:exit(MergePid, shutdown).
restart_merge_then_loop(State, Reason) ->
XFileName = filename("X",State),
error_logger:warning_msg("Merger appears to have failed (reason: ~p). Removing outfile ~s\n", [Reason, XFileName]),
file:delete(XFileName),
check_begin_merge_then_loop(State).
begin_merge(State) ->
AFileName = filename("A",State),
BFileName = filename("B",State),