Merge branch 'michal/mnesia/fix-handling-node-name-as-atom-name/otp-19745' into maint

* michal/mnesia/fix-handling-node-name-as-atom-name/otp-19745:
  Test that node name can be used as table name in mnesia
  Avoid conflict between mnesia_down and master_nodes in mnesia_decision

Author: Mikaka27

lib/mnesia/src/mnesia_recover.erl

@@ -223,15 +223,15 @@ note_decision(Tid, Outcome) ->
     ?ets_insert(Tab, #transient_decision{tid = Tid, outcome = Outcome}).
 
 note_up(Node, _Date, _Time) ->
-    ?ets_delete(mnesia_decision, Node).
+    ?ets_delete(mnesia_decision, {node, Node}).
 
 note_down(Node, Date, Time) ->
-    ?ets_insert(mnesia_decision, {mnesia_down, Node, Date, Time}).
+    ?ets_insert(mnesia_decision, {mnesia_down, {node, Node}, Date, Time}).
 
 note_master_nodes(Tab, []) ->
-    ?ets_delete(mnesia_decision, Tab);
+    ?ets_delete(mnesia_decision, {tab, Tab});
 note_master_nodes(Tab, Nodes) when is_list(Nodes) ->
-    Master = {master_nodes, Tab, Nodes},
+    Master = {master_nodes, {tab, Tab}, Nodes},
     ?ets_insert(mnesia_decision, Master).
 
 note_outcome(D) when D#decision.disc_nodes == [] ->
@@ -295,12 +295,12 @@ get_mnesia_downs() ->
     Tab = mnesia_decision,
     Pat = {mnesia_down, '_', '_', '_'},
     Downs = ?ets_match_object(Tab, Pat),
-    [Node || {mnesia_down, Node, _Date, _Time} <- Downs].
+    [Node || {mnesia_down, {node, Node}, _Date, _Time} <- Downs].
 
 %% Check if we have got a mnesia_down from Node
 has_mnesia_down(Node) ->
-    case ?ets_lookup(mnesia_decision, Node) of
-	[{mnesia_down, Node, _Date, _Time}] ->
+    case ?ets_lookup(mnesia_decision, {node, Node}) of
+	[{mnesia_down, {node, Node}, _Date, _Time}] ->
 	    true;
 	[] ->
 	    false
@@ -380,10 +380,10 @@ get_master_node_info() ->
 
 get_master_node_tables() ->
     Masters = get_master_node_info(),
-    [Tab || {master_nodes, Tab, _Nodes} <- Masters].
+    [Tab || {master_nodes, {tab, Tab}, _Nodes} <- Masters].
 
 get_master_nodes(Tab) ->
-    try ?ets_lookup_element(mnesia_decision, Tab, 3)
+    try ?ets_lookup_element(mnesia_decision, {tab, Tab}, 3)
     catch error:_ -> []
     end.
 
@@ -532,7 +532,15 @@ confirm_decision_log_dump() ->
 dump_decision_tab() ->
     Tab = mnesia_decision,
     All = mnesia_lib:db_match_object(ram_copies,Tab, '_'),
-    mnesia_log:save_decision_tab({decision_list, All}).
+    Converted = lists:map(fun convert_decision_to_disk_format/1, All),
+    mnesia_log:save_decision_tab({decision_list, Converted}).
+
+convert_decision_to_disk_format({mnesia_down, {node, Node}, Date, Time}) ->
+    {mnesia_down, Node, Date, Time};
+convert_decision_to_disk_format({master_nodes, {tab, Tab}, Nodes}) ->
+    {master_nodes, Tab, Nodes};
+convert_decision_to_disk_format(Decision) ->
+    Decision.
 
 note_log_decisions([What | Tail], InitBy) ->
     note_log_decision(What, InitBy),

lib/mnesia/test/mnesia_recovery_test.erl

@@ -87,7 +87,8 @@
          after_corrupt_files_table_dat_head/1,
          after_corrupt_files_table_dat_tail/1,
          after_corrupt_files_schema_dat_head/1,
-         after_corrupt_files_schema_dat_tail/1]).
+         after_corrupt_files_schema_dat_tail/1,
+         node_name_as_table_name/1]).
 
 -export([reader/2, check/0, get_all_retainers/1,
          verify_data/2, verify_where2read/1,
@@ -122,7 +123,8 @@ all() ->
      coord_dies, {group, schema_trans}, {group, async_dirty},
      {group, sync_dirty}, {group, sym_trans},
      {group, asym_trans}, %% after_full_disc_partition,
-     {group, after_corrupt_files}, disc_less, garb_decision
+     {group, after_corrupt_files}, disc_less, garb_decision,
+     node_name_as_table_name
     ].
 
 groups() -> 
@@ -1725,3 +1727,21 @@ check_garb() ->
     catch _:_ -> ok  
     end,
     ok.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+node_name_as_table_name(doc) ->
+    ["Check node name can be used as table name."];
+node_name_as_table_name(suite) ->
+    [];
+node_name_as_table_name(Config) when is_list(Config) ->
+    [N1, N2] = All = ?acquire_nodes(2, Config),
+    Tab = N1,
+
+    ?match({atomic, ok}, mnesia:create_table(Tab, [{ram_copies, [N1]}])),
+
+    ?match([], mnesia_test_lib:kill_mnesia([N1])),
+    ?match(ok, rpc:call(N1, mnesia, start, [[{extra_db_nodes, [N2]}]])),
+    ?match(ok, rpc:call(N1, mnesia, wait_for_tables, [[Tab], 20000])),
+
+    ?verify_mnesia(All, []).