From 82d1b7b4c79cef54f04e062f04b696544609a25b Mon Sep 17 00:00:00 2001
From: Dan Gudmundsson <dgud@erlang.org>
Date: Tue, 11 Oct 2016 15:19:10 +0200
Subject: mnesia: Fix double blocked tables which could cause a crash

Fast restarts could cause table to be blocked twice.
---
 lib/mnesia/src/mnesia_controller.erl | 7 ++++---
 lib/mnesia/src/mnesia_loader.erl     | 8 +++++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/mnesia/src/mnesia_controller.erl b/lib/mnesia/src/mnesia_controller.erl
index 4791e2e290..17b47c059e 100644
--- a/lib/mnesia/src/mnesia_controller.erl
+++ b/lib/mnesia/src/mnesia_controller.erl
@@ -1703,9 +1703,10 @@ add_active_replica(Tab, Node, Cs = #cstruct{}) ->
 
 block_table(Tab) ->
     Var = {Tab, where_to_commit},
-    Old = val(Var),
-    New = {blocked, Old},
-    set(Var, New). % where_to_commit
+    case is_tab_blocked(val(Var)) of
+        {true, _} -> ok;
+        {false, W2C} -> set(Var, mark_blocked_tab(true, W2C))
+    end.
 
 unblock_table(Tab) ->
     call({unblock_table, Tab}).
diff --git a/lib/mnesia/src/mnesia_loader.erl b/lib/mnesia/src/mnesia_loader.erl
index 71e5829c87..d2e42ef0d1 100644
--- a/lib/mnesia/src/mnesia_loader.erl
+++ b/lib/mnesia/src/mnesia_loader.erl
@@ -916,9 +916,15 @@ send_packet(_N, _Pid, _Chunk, DataState) ->
 finish_copy(Pid, Tab, Storage, RemoteS, NeedLock) ->
     RecNode = node(Pid),
     DatBin = dat2bin(Tab, Storage, RemoteS),
+    Node = node(Pid),
     Trans =
 	fun() ->
 		NeedLock andalso mnesia:read_lock_table(Tab),
+                %% Check that receiver is still alive
+                receive {copier_done, Node} ->
+                        throw(receiver_died)
+                after 0 -> ok
+                end,
 		A = val({Tab, access_mode}),
 		mnesia_controller:sync_and_block_table_whereabouts(Tab, RecNode, RemoteS, A),
 		cleanup_tab_copier(Pid, Storage, Tab),
@@ -927,7 +933,7 @@ finish_copy(Pid, Tab, Storage, RemoteS, NeedLock) ->
 		receive
 		    {Pid, no_more} -> % Dont bother about the spurious 'more' message
 			no_more;
-		    {copier_done, Node} when Node == node(Pid)->
+		    {copier_done, Node} ->
 			verbose("Tab receiver ~p crashed (more): ~p~n", [Tab, Node]),
 			receiver_died
 		end
-- 
cgit v1.2.3


From f8c047bb96eff53e5ddaff3d1a00d6a85a990bf3 Mon Sep 17 00:00:00 2001
From: Dan Gudmundsson <dgud@erlang.org>
Date: Mon, 17 Oct 2016 12:16:09 +0200
Subject: Avoid some error reports when stopping mnesia

Worker processes can cause error reports if the main mnesia processes
dissapear.
---
 lib/mnesia/src/mnesia_loader.erl | 9 ++++++---
 lib/mnesia/src/mnesia_tm.erl     | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/mnesia/src/mnesia_loader.erl b/lib/mnesia/src/mnesia_loader.erl
index d2e42ef0d1..c710470a2c 100644
--- a/lib/mnesia/src/mnesia_loader.erl
+++ b/lib/mnesia/src/mnesia_loader.erl
@@ -342,9 +342,12 @@ spawned_receiver(ReplyTo,Tab,Storage,Cs, SenderPid,TabSize,DetsData, Init) ->
     Done = do_init_table(Tab,Storage,Cs,
 			 SenderPid,TabSize,DetsData,
 			 ReplyTo, Init),
-    ReplyTo ! {self(),Done},
-    unlink(ReplyTo),
-    unlink(whereis(mnesia_controller)),
+    try
+        ReplyTo ! {self(),Done},
+        unlink(ReplyTo),
+        unlink(whereis(mnesia_controller))
+    catch _:_ -> ok %% avoid error reports when stopping down mnesia
+    end,
     exit(normal).
 
 wait_on_load_complete(Pid) ->
diff --git a/lib/mnesia/src/mnesia_tm.erl b/lib/mnesia/src/mnesia_tm.erl
index b116b48312..388b42cf15 100644
--- a/lib/mnesia/src/mnesia_tm.erl
+++ b/lib/mnesia/src/mnesia_tm.erl
@@ -950,7 +950,7 @@ return_abort(Fun, Args, Reason)  ->
     if
 	Level == 1 ->
 	    mnesia_locker:async_release_tid(Nodes, Tid),
-	    ?MODULE ! {delete_transaction, Tid},
+	    ?SAFE(?MODULE ! {delete_transaction, Tid}),
 	    erase(mnesia_activity_state),
 	    flush_downs(),
 	    ?SAFE(unlink(whereis(?MODULE))),
-- 
cgit v1.2.3