Log left over when shutting L0

This commit is contained in:
Martin Sumner 2019-02-26 18:51:29 +00:00
parent 01f731dbc9
commit f4d68ae02f
2 changed files with 7 additions and 7 deletions

View file

@ -98,7 +98,7 @@
{"P0008", {"P0008",
{info, "Penciller closing for reason ~w"}}, {info, "Penciller closing for reason ~w"}},
{"P0010", {"P0010",
{info, "No level zero action on close of Penciller discarded=~w"}}, {info, "discarded=~w level zero on close of Penciller"}},
{"P0011", {"P0011",
{info, "Shutdown complete for Penciller for reason ~w"}}, {info, "Shutdown complete for Penciller for reason ~w"}},
{"P0012", {"P0012",

View file

@ -906,10 +906,9 @@ handle_call(close, _From, State) ->
% on the clerk. % on the clerk.
ok = leveled_pclerk:clerk_close(State#state.clerk), ok = leveled_pclerk:clerk_close(State#state.clerk),
leveled_log:log("P0008", [close]), leveled_log:log("P0008", [close]),
case State#state.levelzero_pending of L0Empty = State#state.levelzero_size == 0,
case (not State#state.levelzero_pending and not L0Empty) of
true -> true ->
leveled_log:log("P0010", [State#state.levelzero_size]);
false ->
L0_Left = State#state.levelzero_size > 0, L0_Left = State#state.levelzero_size > 0,
{UpdState, _L0Bloom} = maybe_roll_memory(State, L0_Left, true), {UpdState, _L0Bloom} = maybe_roll_memory(State, L0_Left, true),
L0Pid = UpdState#state.levelzero_constructor, L0Pid = UpdState#state.levelzero_constructor,
@ -917,10 +916,11 @@ handle_call(close, _From, State) ->
true -> true ->
ok = leveled_sst:sst_close(L0Pid); ok = leveled_sst:sst_close(L0Pid);
false -> false ->
ok leveled_log:log("P0010", [State#state.levelzero_size])
end end;
false ->
leveled_log:log("P0010", [State#state.levelzero_size])
end, end,
shutdown_manifest(State#state.manifest, State#state.levelzero_constructor), shutdown_manifest(State#state.manifest, State#state.levelzero_constructor),
{stop, normal, ok, State}; {stop, normal, ok, State};
handle_call(doom, _From, State) -> handle_call(doom, _From, State) ->