From f4d68ae02f808645babceb40c14365def35cdd96 Mon Sep 17 00:00:00 2001 From: Martin Sumner Date: Tue, 26 Feb 2019 18:51:29 +0000 Subject: [PATCH] Log left over when shutting L0 --- src/leveled_log.erl | 2 +- src/leveled_penciller.erl | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/leveled_log.erl b/src/leveled_log.erl index c88bfc5..bcb8900 100644 --- a/src/leveled_log.erl +++ b/src/leveled_log.erl @@ -98,7 +98,7 @@ {"P0008", {info, "Penciller closing for reason ~w"}}, {"P0010", - {info, "No level zero action on close of Penciller discarded=~w"}}, + {info, "discarded=~w level zero on close of Penciller"}}, {"P0011", {info, "Shutdown complete for Penciller for reason ~w"}}, {"P0012", diff --git a/src/leveled_penciller.erl b/src/leveled_penciller.erl index d076dcc..4fb6f12 100644 --- a/src/leveled_penciller.erl +++ b/src/leveled_penciller.erl @@ -906,10 +906,9 @@ handle_call(close, _From, State) -> % on the clerk. ok = leveled_pclerk:clerk_close(State#state.clerk), 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 -> - leveled_log:log("P0010", [State#state.levelzero_size]); - false -> L0_Left = State#state.levelzero_size > 0, {UpdState, _L0Bloom} = maybe_roll_memory(State, L0_Left, true), L0Pid = UpdState#state.levelzero_constructor, @@ -917,10 +916,11 @@ handle_call(close, _From, State) -> true -> ok = leveled_sst:sst_close(L0Pid); false -> - ok - end + leveled_log:log("P0010", [State#state.levelzero_size]) + end; + false -> + leveled_log:log("P0010", [State#state.levelzero_size]) end, - shutdown_manifest(State#state.manifest, State#state.levelzero_constructor), {stop, normal, ok, State}; handle_call(doom, _From, State) ->