mnesia: Cleanup and remove obsolete code

We don't support communicating with such old nodes anyway.

1 files changed, 20 insertions, 105 deletions

diff --git a/lib/mnesia/src/mnesia_checkpoint.erl b/lib/mnesia/src/mnesia_checkpoint.erl
index eb8fe38908..89425d354c 100644
--- a/lib/mnesia/src/mnesia_checkpoint.erl
+++ b/lib/mnesia/src/mnesia_checkpoint.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -31,8 +31,7 @@
 	 tm_retain/5,
 	 tm_enter_pending/1,
 	 tm_enter_pending/3,
-	 tm_exit_pending/1,
-	 convert_cp_record/1
+	 tm_exit_pending/1
 	]).
 
 %% Public interface
@@ -88,25 +87,6 @@
 			  pid
 			 }).
 
-%% Old record definition
--record(checkpoint, {name,
-		     allow_remote,
-		     ram_overrides_dump,
-		     nodes,
-		     node,
-		     now,
-		     min,
-		     max,
-		     pending_tab,
-		     wait_for_old,
-		     is_activated,
-		     ignore_new,
-		     retainers,
-		     iterators,
-		     supervisor,
-		     pid
-		    }).
-
 -record(retainer, {cp_name, tab_name, store, writers = [], really_retain = true}).
 
 -record(iter, {tab_name, oid_tab, main_tab, retainer_tab, source, val, pid}).
@@ -129,15 +109,6 @@ tm_prepare(Cp) when is_record(Cp, checkpoint_args) ->
 	    start_retainer(Cp);
 	true ->
 	    {error, {already_exists, Name, node()}}
-    end;
-tm_prepare(Cp) when is_record(Cp, checkpoint) ->
-    %% Node with old protocol sent an old checkpoint record
-    %% and we have to convert it
-    case convert_cp_record(Cp) of
-	{ok, NewCp} ->
-	    tm_prepare(NewCp);
-	{error, Reason} ->
-	    {error, Reason}
     end.
 
 tm_mnesia_down(Node) ->
@@ -371,9 +342,7 @@ activate(Args) ->
     end.
 
 args2cp(Args) when is_list(Args)->
-    case catch lists:foldl(fun check_arg/2, #checkpoint_args{}, Args) of
-	{'EXIT', Reason} ->
-	    {error, Reason};
+    try lists:foldl(fun check_arg/2, #checkpoint_args{}, Args) of
 	Cp ->
 	    case check_tables(Cp) of
 		{error, Reason} ->
@@ -381,6 +350,10 @@ args2cp(Args) when is_list(Args)->
 		{ok, Overriders, AllTabs} ->
 		    arrange_retainers(Cp, Overriders, AllTabs)
 	    end
+    catch exit:Reason ->
+	    {error, Reason};
+	  error:Reason ->
+	    {error, Reason}
     end;
 args2cp(Args) ->
     {error, {badarg, Args}}.
@@ -390,10 +363,10 @@ check_arg({name, Name}, Cp) ->
 	true ->
 	    exit({already_exists, Name});
 	false ->
-	    case catch tab2retainer({foo, Name}) of
-		List when is_list(List) ->
-		    Cp#checkpoint_args{name = Name};
-		_ ->
+	    try
+		[_|_] = tab2retainer({foo, Name}),
+		Cp#checkpoint_args{name = Name}
+	    catch _:_ ->
 		    exit({badarg, Name})
 	    end
     end;
@@ -641,11 +614,7 @@ init(Cp) ->
     process_flag(priority, high), %% Needed dets files might starve the system
     Name = Cp#checkpoint_args.name,
     Props = [set, public, {keypos, 2}],
-    case catch ?ets_new_table(mnesia_pending_checkpoint, Props) of
-	{'EXIT', Reason} -> %% system limit
-	    Msg = "Cannot create an ets table for pending transactions",
-	    Error = {error, {system_limit, Name, Msg, Reason}},
-	    proc_lib:init_ack(Cp#checkpoint_args.supervisor, Error);
+    try ?ets_new_table(mnesia_pending_checkpoint, Props) of
 	PendingTab ->
 	    Rs = [prepare_tab(Cp, R) || R <- Cp#checkpoint_args.retainers],
 	    Cp2 = Cp#checkpoint_args{retainers = Rs,
@@ -658,6 +627,10 @@ init(Cp) ->
 	    dbg_out("Checkpoint ~p (~p) started~n", [Name, self()]),
 	    proc_lib:init_ack(Cp2#checkpoint_args.supervisor, {ok, self()}),
 	    retainer_loop(Cp2)
+    catch error:Reason -> %% system limit
+	    Msg = "Cannot create an ets table for pending transactions",
+	    Error = {error, {system_limit, Name, Msg, Reason}},
+	    proc_lib:init_ack(Cp#checkpoint_args.supervisor, Error)
     end.
     
 prepare_tab(Cp, R) ->
@@ -903,12 +876,13 @@ retainer_loop(Cp) ->
 
 	{system, From, Msg} ->
 	    dbg_out("~p got {system, ~p, ~p}~n", [?MODULE, From, Msg]),
-	    sys:handle_system_msg(Msg, From, no_parent, ?MODULE, [], Cp)
+	    sys:handle_system_msg(Msg, From, Cp#checkpoint_args.supervisor,
+				  ?MODULE, [], Cp)
     end.
 
 maybe_activate(Cp)
-        when Cp#checkpoint_args.wait_for_old == [],
-             Cp#checkpoint_args.is_activated == false ->
+  when Cp#checkpoint_args.wait_for_old == [],
+       Cp#checkpoint_args.is_activated == false ->
     Cp#checkpoint_args{pending_tab = undefined, is_activated = true};
 maybe_activate(Cp) ->
     Cp.
@@ -1226,65 +1200,6 @@ system_terminate(_Reason, _Parent,_Debug, Cp) ->
 system_code_change(Cp, _Module, _OldVsn, _Extra) ->
     {ok, Cp}.
 
-convert_cp_record(Cp) when is_record(Cp, checkpoint) ->
-    ROD = 
-	case Cp#checkpoint.ram_overrides_dump of
-	    true -> Cp#checkpoint.min ++ Cp#checkpoint.max;
-	    false -> []
-	end,
-
-    {ok, #checkpoint_args{name = Cp#checkpoint.name,
-			  allow_remote = Cp#checkpoint.name,
-			  ram_overrides_dump = ROD,
-			  nodes = Cp#checkpoint.nodes,
-			  node = Cp#checkpoint.node,
-			  now = Cp#checkpoint.now,
-			  cookie = ?unique_cookie,
-			  min = Cp#checkpoint.min,
-			  max = Cp#checkpoint.max,
-			  pending_tab = Cp#checkpoint.pending_tab,
-			  wait_for_old = Cp#checkpoint.wait_for_old,
-			  is_activated = Cp#checkpoint.is_activated,
-			  ignore_new = Cp#checkpoint.ignore_new,
-			  retainers = Cp#checkpoint.retainers,
-			  iterators = Cp#checkpoint.iterators,
-			  supervisor = Cp#checkpoint.supervisor,
-			  pid = Cp#checkpoint.pid
-			 }};
-convert_cp_record(Cp) when is_record(Cp, checkpoint_args) ->
-    AllTabs = Cp#checkpoint_args.min ++ Cp#checkpoint_args.max,
-    ROD = case Cp#checkpoint_args.ram_overrides_dump of
-	      [] -> 
-		  false;
-	      AllTabs -> 
-		  true;
-	      _ -> 
-		  error
-	  end,
-    if
-	ROD == error ->
-	    {error, {"Old node cannot handle new checkpoint protocol",
-		     ram_overrides_dump}};
-	true ->
-	    {ok, #checkpoint{name = Cp#checkpoint_args.name,
-			     allow_remote = Cp#checkpoint_args.name,
-			     ram_overrides_dump = ROD,
-			     nodes = Cp#checkpoint_args.nodes,
-			     node = Cp#checkpoint_args.node,
-			     now = Cp#checkpoint_args.now,
-			     min = Cp#checkpoint_args.min,
-			     max = Cp#checkpoint_args.max,
-			     pending_tab = Cp#checkpoint_args.pending_tab,
-			     wait_for_old = Cp#checkpoint_args.wait_for_old,
-			     is_activated = Cp#checkpoint_args.is_activated,
-			     ignore_new = Cp#checkpoint_args.ignore_new,
-			     retainers = Cp#checkpoint_args.retainers,
-			     iterators = Cp#checkpoint_args.iterators,
-			     supervisor = Cp#checkpoint_args.supervisor,
-			     pid = Cp#checkpoint_args.pid
-			    }}
-    end.
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%
 
 val(Var) ->