diff options
| author | Dan Gudmundsson <[email protected]> | 2017-02-01 12:15:06 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2017-02-01 12:15:06 +0100 |
| commit | 3d81b5c93865c621372330ffb826eba157c8d0f7 (patch) | |
| tree | b9a4c998f30efb03506c20cbb2850377940cb6dc /lib/mnesia/src | |
| parent | 9b133547ba26090dfc0dd457fa7ec8dc8329109c (diff) | |
| parent | b54110ecf05e6403658f5ca8cfa180e287b7d90c (diff) | |
| download | otp-3d81b5c93865c621372330ffb826eba157c8d0f7.tar.gz otp-3d81b5c93865c621372330ffb826eba157c8d0f7.tar.bz2 otp-3d81b5c93865c621372330ffb826eba157c8d0f7.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
Fixed crash when a table was deleted during checkpoint traversal
Diffstat (limited to 'lib/mnesia/src')
| -rw-r--r-- | lib/mnesia/src/mnesia_checkpoint.erl | 7 | ||||
| -rw-r--r-- | lib/mnesia/src/mnesia_event.erl | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/mnesia/src/mnesia_checkpoint.erl b/lib/mnesia/src/mnesia_checkpoint.erl index 9eb939e8d3..fc626940b4 100644 --- a/lib/mnesia/src/mnesia_checkpoint.erl +++ b/lib/mnesia/src/mnesia_checkpoint.erl @@ -909,7 +909,7 @@ retainer_loop(Cp = #checkpoint_args{name=Name}) -> retainer_loop(Cp2); {From, {iter_end, Iter}} -> - retainer_fixtable(Iter#iter.oid_tab, false), + ?SAFE(retainer_fixtable(Iter#iter.oid_tab, false)), Iters = Cp#checkpoint_args.iterators -- [Iter], reply(From, Name, ok), retainer_loop(Cp#checkpoint_args{iterators = Iters}); @@ -971,7 +971,8 @@ do_stop(Cp) -> unset({checkpoint, Name}), lists:foreach(fun deactivate_tab/1, Cp#checkpoint_args.retainers), Iters = Cp#checkpoint_args.iterators, - lists:foreach(fun(I) -> retainer_fixtable(I#iter.oid_tab, false) end, Iters). + [?SAFE(retainer_fixtable(Tab, false)) || #iter{main_tab=Tab} <- Iters], + ok. deactivate_tab(R) -> Name = R#retainer.cp_name, @@ -1151,7 +1152,7 @@ do_change_copy(Cp, Tab, FromType, ToType) -> Cp#checkpoint_args{retainers = Rs, nodes = writers(Rs)}. check_iter(From, Iter) when Iter#iter.pid == From -> - retainer_fixtable(Iter#iter.oid_tab, false), + ?SAFE(retainer_fixtable(Iter#iter.oid_tab, false)), false; check_iter(_From, _Iter) -> true. diff --git a/lib/mnesia/src/mnesia_event.erl b/lib/mnesia/src/mnesia_event.erl index 7320d381ea..6f7531245f 100644 --- a/lib/mnesia/src/mnesia_event.erl +++ b/lib/mnesia/src/mnesia_event.erl @@ -114,7 +114,8 @@ handle_table_event({Oper, Record, TransId}, State) -> handle_system_event({mnesia_checkpoint_activated, _Checkpoint}, State) -> {ok, State}; -handle_system_event({mnesia_checkpoint_deactivated, _Checkpoint}, State) -> +handle_system_event({mnesia_checkpoint_deactivated, Checkpoint}, State) -> + report_error("Checkpoint '~p' has been deactivated, last table copy deleted.\n",[Checkpoint]), {ok, State}; handle_system_event({mnesia_up, Node}, State) -> |