aboutsummaryrefslogtreecommitdiffstats
path: root/lib/mnesia/src/mnesia_monitor.erl
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2013-11-29 09:51:08 +0100
committerDan Gudmundsson <[email protected]>2013-11-29 09:51:08 +0100
commit0279799e4f3d2404f657863d04d8c1d6f6c08985 (patch)
treea38660d14bbfbf43c91a7fdba9aa50752e9c17a6 /lib/mnesia/src/mnesia_monitor.erl
parentd299987d7e22d1236f14a4e097e8ee805a1b72ea (diff)
parent9237801d22a38d2643ffe94ab626c4d2815012dd (diff)
downloadotp-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_monitor.erl')
-rw-r--r--lib/mnesia/src/mnesia_monitor.erl6
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/mnesia/src/mnesia_monitor.erl b/lib/mnesia/src/mnesia_monitor.erl
index 7a788238fc..438da65158 100644
--- a/lib/mnesia/src/mnesia_monitor.erl
+++ b/lib/mnesia/src/mnesia_monitor.erl
@@ -482,11 +482,7 @@ handle_cast({mnesia_down, mnesia_controller, Node}, State) ->
mnesia_tm:mnesia_down(Node),
{noreply, State};
-handle_cast({mnesia_down, mnesia_tm, {Node, Pending}}, State) ->
- mnesia_locker:mnesia_down(Node, Pending),
- {noreply, State};
-
-handle_cast({mnesia_down, mnesia_locker, Node}, State) ->
+handle_cast({mnesia_down, mnesia_tm, Node}, State) ->
Down = {mnesia_down, Node},
mnesia_lib:report_system_event(Down),
GoingDown = lists:delete(Node, State#state.going_down),