diff options
| author | Erlang/OTP <[email protected]> | 2011-11-10 14:55:10 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2011-11-10 14:55:10 +0100 |
| commit | cfff1f4079a91b9e78aa8294186a1acae77d82d5 (patch) | |
| tree | ddb0cb549e98f37d068fac65c1821bcac796f102 /lib/mnesia/src/mnesia_event.erl | |
| parent | f561a98a9b89738467b52ab5213562de753f6ad2 (diff) | |
| parent | 3879a583bf5a5889c2037b6410cd5ae58ff5e508 (diff) | |
| download | otp-cfff1f4079a91b9e78aa8294186a1acae77d82d5.tar.gz otp-cfff1f4079a91b9e78aa8294186a1acae77d82d5.tar.bz2 otp-cfff1f4079a91b9e78aa8294186a1acae77d82d5.zip | |
Merge branch 'dgud/mnesia/upgrade-cont/OTP-9657' into maint-r14
* dgud/mnesia/upgrade-cont/OTP-9657:
Prepare release
[mnesia] Fix deadlock in aborted mnesia:del_table_copy/2
[mnesia] Make all schema operations protocol aware
[mnesia] Remove export of clear_table which is not a schema operation anymore
[mnesia] Cleanly bring down mnesia
Diffstat (limited to 'lib/mnesia/src/mnesia_event.erl')
| -rw-r--r-- | lib/mnesia/src/mnesia_event.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/mnesia/src/mnesia_event.erl b/lib/mnesia/src/mnesia_event.erl index ec6b99ecaa..5a060a28ff 100644 --- a/lib/mnesia/src/mnesia_event.erl +++ b/lib/mnesia/src/mnesia_event.erl @@ -121,7 +121,7 @@ handle_system_event({mnesia_up, Node}, State) -> {ok, State#state{nodes = Nodes}}; handle_system_event({mnesia_down, Node}, State) -> - case mnesia:system_info(fallback_activated) of + case mnesia:system_info(fallback_activated) andalso Node =/= node() of true -> case mnesia_monitor:get_env(fallback_error_function) of {mnesia, lkill} -> @@ -129,8 +129,8 @@ handle_system_event({mnesia_down, Node}, State) -> "must be restarted. Forcing shutdown " "after mnesia_down from ~p...~n", report_fatal(Msg, [Node], nocore, State#state.dumped_core), - mnesia:lkill(), - exit(fatal); + catch exit(whereis(mnesia_monitor), fatal), + {ok, State}; {UserMod, UserFunc} -> Msg = "Warning: A fallback is installed and Mnesia got mnesia_down " "from ~p. ~n", |