diff options
| author | Dan Gudmundsson <[email protected]> | 2013-11-29 09:51:08 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2013-11-29 09:51:08 +0100 |
| commit | 0279799e4f3d2404f657863d04d8c1d6f6c08985 (patch) | |
| tree | a38660d14bbfbf43c91a7fdba9aa50752e9c17a6 /lib/mnesia/src/mnesia_tm.erl | |
| parent | d299987d7e22d1236f14a4e097e8ee805a1b72ea (diff) | |
| parent | 9237801d22a38d2643ffe94ab626c4d2815012dd (diff) | |
| download | otp-0279799e4f3d2404f657863d04d8c1d6f6c08985.tar.gz otp-0279799e4f3d2404f657863d04d8c1d6f6c08985.tar.bz2 otp-0279799e4f3d2404f657863d04d8c1d6f6c08985.zip | |
Merge branch 'dgud/mnesia/sticky-race/OTP-11375' into maint
* dgud/mnesia/sticky-race/OTP-11375:
mnesia: Synchronize lock cleanup after mnesia down
Diffstat (limited to 'lib/mnesia/src/mnesia_tm.erl')
| -rw-r--r-- | lib/mnesia/src/mnesia_tm.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/mnesia/src/mnesia_tm.erl b/lib/mnesia/src/mnesia_tm.erl index e54e5c4e88..17af0cad44 100644 --- a/lib/mnesia/src/mnesia_tm.erl +++ b/lib/mnesia/src/mnesia_tm.erl @@ -181,7 +181,7 @@ mnesia_down(Node) -> %% mnesia_monitor takes care of the sync case whereis(?MODULE) of undefined -> - mnesia_monitor:mnesia_down(?MODULE, {Node, []}); + mnesia_monitor:mnesia_down(?MODULE, Node); Pid -> Pid ! {mnesia_down, Node} end. @@ -403,7 +403,9 @@ doit_loop(#state{coordinators=Coordinators,participants=Participants,supervisor= Tids = gb_trees:keys(Participants), reconfigure_participants(N, gb_trees:values(Participants)), NewState = clear_fixtable(N, State), - mnesia_monitor:mnesia_down(?MODULE, {N, Tids}), + + mnesia_locker:mnesia_down(N, Tids), + mnesia_monitor:mnesia_down(?MODULE, N), doit_loop(NewState); {From, {unblock_me, Tab}} -> |