Set Persisted SQN (regression)

As part of previous change had stopped setting the persisted SQN in the
ledger - which stopped journal compaction from working)
This commit is contained in:
martinsumner 2016-11-05 12:03:21 +00:00
parent 309ca2d6a1
commit 87b5bd0b18
2 changed files with 9 additions and 8 deletions

View file

@ -487,7 +487,8 @@ handle_cast({levelzero_complete, FN, StartKey, EndKey}, State) ->
levelzero_constructor=undefined, levelzero_constructor=undefined,
levelzero_index=leveled_pmem:new_index(), levelzero_index=leveled_pmem:new_index(),
levelzero_size=0, levelzero_size=0,
manifest=UpdMan}}. manifest=UpdMan,
persisted_sqn=State#state.ledger_sqn}}.
handle_info({_Ref, {ok, SrcFN, _StartKey, _EndKey}}, State) -> handle_info({_Ref, {ok, SrcFN, _StartKey, _EndKey}}, State) ->
@ -531,10 +532,10 @@ terminate(Reason, State) ->
State State
end, end,
case {UpdState#state.levelzero_pending, case {UpdState#state.levelzero_pending,
get_item(0, State#state.manifest, []), get_item(0, UpdState#state.manifest, []),
State#state.levelzero_size} of UpdState#state.levelzero_size} of
{true, [], _} -> {true, [], _} ->
ok = leveled_sft:sft_close(State#state.levelzero_constructor); ok = leveled_sft:sft_close(UpdState#state.levelzero_constructor);
{false, [], 0} -> {false, [], 0} ->
leveled_log:log("P0009", []); leveled_log:log("P0009", []);
{false, [], _N} -> {false, [], _N} ->

View file

@ -362,10 +362,10 @@ handle_cast({sft_newfroml0cache, Filename, Slots, FetchFun, PCL}, _State) ->
undefined -> undefined ->
{noreply, State}; {noreply, State};
_ -> _ ->
ok = leveled_penciller:pcl_confirml0complete(PCL, leveled_penciller:pcl_confirml0complete(PCL,
Filename, Filename,
State#state.smallest_key, State#state.smallest_key,
State#state.highest_key), State#state.highest_key),
{noreply, State} {noreply, State}
end; end;
handle_cast(close, State) -> handle_cast(close, State) ->