Change to cast in inker/iclerk interaction
This allows for leveled_iclerk:clerk_stop to be a sync call, so that files will only be closed once the iclerk has stopped. This is designed ot prevent iclerk crashes during shutdowns when files it is depnding on are closed mid shutdown.
This commit is contained in:
Martin Sumner
parent
28d0aef5fe
commit
0333604fd9
3 changed files with 78 additions and 100 deletions
|
|
@ -105,11 +105,10 @@
|
|||
ink_registersnapshot/2,
|
||||
ink_confirmdelete/2,
|
||||
ink_compactjournal/3,
|
||||
ink_compactioncomplete/1,
|
||||
ink_clerkcomplete/3,
|
||||
ink_compactionpending/1,
|
||||
ink_trim/2,
|
||||
ink_getmanifest/1,
|
||||
ink_updatemanifest/3,
|
||||
ink_printmanifest/1,
|
||||
ink_close/1,
|
||||
ink_doom/1,
|
||||
|
|
@ -359,7 +358,7 @@ ink_loadpcl(Pid, MinSQN, FilterFun, Penciller) ->
|
|||
%% that any value that was written more recently than the last flush to disk
|
||||
%% of the Ledger will not be considered for compaction (as this may be
|
||||
%% required to reload the Ledger on startup).
|
||||
ink_compactjournal(Pid, Bookie, Timeout) ->
|
||||
ink_compactjournal(Pid, Bookie, _Timeout) ->
|
||||
CheckerInitiateFun = fun initiate_penciller_snapshot/1,
|
||||
CheckerCloseFun = fun leveled_penciller:pcl_close/1,
|
||||
CheckerFilterFun =
|
||||
|
|
@ -369,28 +368,26 @@ ink_compactjournal(Pid, Bookie, Timeout) ->
|
|||
Bookie,
|
||||
CheckerInitiateFun,
|
||||
CheckerCloseFun,
|
||||
CheckerFilterFun,
|
||||
Timeout},
|
||||
CheckerFilterFun},
|
||||
infinity).
|
||||
|
||||
%% Allows the Checker to be overriden in test, use something other than a
|
||||
%% penciller
|
||||
ink_compactjournal(Pid, Checker, InitiateFun, CloseFun, FilterFun, Timeout) ->
|
||||
ink_compactjournal(Pid, Checker, InitiateFun, CloseFun, FilterFun, _Timeout) ->
|
||||
gen_server:call(Pid,
|
||||
{compact,
|
||||
Checker,
|
||||
InitiateFun,
|
||||
CloseFun,
|
||||
FilterFun,
|
||||
Timeout},
|
||||
FilterFun},
|
||||
infinity).
|
||||
|
||||
-spec ink_compactioncomplete(pid()) -> ok.
|
||||
-spec ink_clerkcomplete(pid(), list(), list()) -> ok.
|
||||
%% @doc
|
||||
%% Used by a clerk to state that a compaction process is over, only change
|
||||
%% is to unlock the Inker for further compactions.
|
||||
ink_compactioncomplete(Pid) ->
|
||||
gen_server:call(Pid, compaction_complete, infinity).
|
||||
ink_clerkcomplete(Pid, ManifestSnippet, FilesToDelete) ->
|
||||
gen_server:cast(Pid, {clerk_complete, ManifestSnippet, FilesToDelete}).
|
||||
|
||||
-spec ink_compactionpending(pid()) -> boolean().
|
||||
%% @doc
|
||||
|
|
@ -425,21 +422,6 @@ ink_backup(Pid, BackupPath) ->
|
|||
ink_getmanifest(Pid) ->
|
||||
gen_server:call(Pid, get_manifest, infinity).
|
||||
|
||||
-spec ink_updatemanifest(pid(), list(), list()) -> {ok, integer()}.
|
||||
%% @doc
|
||||
%% Add a section of new entries into the manifest, and drop a bunch of deleted
|
||||
%% files out of the manifest. Used to update the manifest after a compaction
|
||||
%% job.
|
||||
%%
|
||||
%% Returns {ok, ManSQN} with the ManSQN being the sequence number of the
|
||||
%% updated manifest
|
||||
ink_updatemanifest(Pid, ManifestSnippet, DeletedFiles) ->
|
||||
gen_server:call(Pid,
|
||||
{update_manifest,
|
||||
ManifestSnippet,
|
||||
DeletedFiles},
|
||||
infinity).
|
||||
|
||||
-spec ink_printmanifest(pid()) -> ok.
|
||||
%% @doc
|
||||
%% Used in tests to print out the manifest
|
||||
|
|
@ -574,27 +556,6 @@ handle_call({confirm_delete, ManSQN}, _From, State) ->
|
|||
State#state{registered_snapshots = RegisteredSnapshots0}};
|
||||
handle_call(get_manifest, _From, State) ->
|
||||
{reply, leveled_imanifest:to_list(State#state.manifest), State};
|
||||
handle_call({update_manifest,
|
||||
ManifestSnippet,
|
||||
DeletedFiles}, _From, State) ->
|
||||
DropFun =
|
||||
fun(E, Acc) ->
|
||||
leveled_imanifest:remove_entry(Acc, E)
|
||||
end,
|
||||
Man0 = lists:foldl(DropFun, State#state.manifest, DeletedFiles),
|
||||
AddFun =
|
||||
fun(E, Acc) ->
|
||||
leveled_imanifest:add_entry(Acc, E, false)
|
||||
end,
|
||||
Man1 = lists:foldl(AddFun, Man0, ManifestSnippet),
|
||||
NewManifestSQN = State#state.manifest_sqn + 1,
|
||||
leveled_imanifest:printer(Man1),
|
||||
leveled_imanifest:writer(Man1, NewManifestSQN, State#state.root_path),
|
||||
{reply,
|
||||
{ok, NewManifestSQN},
|
||||
State#state{manifest=Man1,
|
||||
manifest_sqn=NewManifestSQN,
|
||||
pending_removals=DeletedFiles}};
|
||||
handle_call(print_manifest, _From, State) ->
|
||||
leveled_imanifest:printer(State#state.manifest),
|
||||
{reply, ok, State};
|
||||
|
|
@ -602,28 +563,26 @@ handle_call({compact,
|
|||
Checker,
|
||||
InitiateFun,
|
||||
CloseFun,
|
||||
FilterFun,
|
||||
Timeout},
|
||||
FilterFun},
|
||||
_From, State) ->
|
||||
case State#state.compaction_pending of
|
||||
true ->
|
||||
{reply, busy, State};
|
||||
false ->
|
||||
Manifest = leveled_imanifest:to_list(State#state.manifest),
|
||||
leveled_iclerk:clerk_compact(State#state.clerk,
|
||||
Checker,
|
||||
InitiateFun,
|
||||
CloseFun,
|
||||
FilterFun,
|
||||
self(),
|
||||
Timeout),
|
||||
Manifest),
|
||||
{reply, ok, State#state{compaction_pending=true}}
|
||||
end;
|
||||
handle_call(compaction_complete, _From, State) ->
|
||||
{reply, ok, State#state{compaction_pending=false}};
|
||||
handle_call(compaction_pending, _From, State) ->
|
||||
{reply, State#state.compaction_pending, State};
|
||||
handle_call({trim, PersistedSQN}, _From, State) ->
|
||||
ok = leveled_iclerk:clerk_trim(State#state.clerk, self(), PersistedSQN),
|
||||
Manifest = leveled_imanifest:to_list(State#state.manifest),
|
||||
ok = leveled_iclerk:clerk_trim(State#state.clerk, PersistedSQN, Manifest),
|
||||
{reply, ok, State};
|
||||
handle_call(roll, _From, State) ->
|
||||
case leveled_cdb:cdb_lastkey(State#state.active_journaldb) of
|
||||
|
|
@ -717,7 +676,7 @@ handle_call(close, _From, State) ->
|
|||
leveled_log:log("I0005", [close]),
|
||||
leveled_log:log("I0006", [State#state.journal_sqn,
|
||||
State#state.manifest_sqn]),
|
||||
leveled_iclerk:clerk_stop(State#state.clerk),
|
||||
ok = leveled_iclerk:clerk_stop(State#state.clerk),
|
||||
shutdown_snapshots(State#state.registered_snapshots),
|
||||
shutdown_manifest(State#state.manifest)
|
||||
end,
|
||||
|
|
@ -732,12 +691,33 @@ handle_call(doom, _From, State) ->
|
|||
leveled_log:log("I0005", [doom]),
|
||||
leveled_log:log("I0006", [State#state.journal_sqn,
|
||||
State#state.manifest_sqn]),
|
||||
leveled_iclerk:clerk_stop(State#state.clerk),
|
||||
ok = leveled_iclerk:clerk_stop(State#state.clerk),
|
||||
shutdown_snapshots(State#state.registered_snapshots),
|
||||
shutdown_manifest(State#state.manifest),
|
||||
|
||||
{stop, normal, {ok, FPs}, State}.
|
||||
|
||||
|
||||
handle_cast({clerk_complete, ManifestSnippet, FilesToDelete}, State) ->
|
||||
DropFun =
|
||||
fun(E, Acc) ->
|
||||
leveled_imanifest:remove_entry(Acc, E)
|
||||
end,
|
||||
Man0 = lists:foldl(DropFun, State#state.manifest, FilesToDelete),
|
||||
AddFun =
|
||||
fun(E, Acc) ->
|
||||
leveled_imanifest:add_entry(Acc, E, false)
|
||||
end,
|
||||
Man1 = lists:foldl(AddFun, Man0, ManifestSnippet),
|
||||
NewManifestSQN = State#state.manifest_sqn + 1,
|
||||
leveled_imanifest:printer(Man1),
|
||||
leveled_imanifest:writer(Man1, NewManifestSQN, State#state.root_path),
|
||||
ok = leveled_iclerk:clerk_promptdeletions(State#state.clerk,
|
||||
NewManifestSQN,
|
||||
FilesToDelete),
|
||||
{noreply, State#state{manifest=Man1,
|
||||
manifest_sqn=NewManifestSQN,
|
||||
pending_removals=FilesToDelete,
|
||||
compaction_pending=false}};
|
||||
handle_cast({release_snapshot, Snapshot}, State) ->
|
||||
Rs = lists:keydelete(Snapshot, 1, State#state.registered_snapshots),
|
||||
leveled_log:log("I0003", [Snapshot]),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue