Remove stale support for remote target nodes

The support for remote target nodes has not worked in a long time.
We are unlikely to ever need remot target node support and if
we'll need it will be easier to start over from scratch.

1 files changed, 23 insertions, 233 deletions

diff --git a/lib/test_server/src/test_server_node.erl b/lib/test_server/src/test_server_node.erl
index 872f15f2be..b307d93c7d 100644
--- a/lib/test_server/src/test_server_node.erl
+++ b/lib/test_server/src/test_server_node.erl
@@ -26,7 +26,7 @@
 
 %% Test Controller interface
 -export([is_release_available/1]).
--export([start_remote_main_target/1,stop/1]).
+-export([stop/1]).
 -export([start_tracer_node/2,trace_nodes/2,stop_tracer_node/1]).
 -export([start_node/5, stop_node/2]).
 -export([kill_nodes/1, nodedown/2]).
@@ -57,79 +57,8 @@ is_release_available(Rel) ->
 	    false
     end.
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% Start main target node on remote host
-%%% The target node must not know the controller node via erlang distribution.
-start_remote_main_target(Parameters) ->
-    #par{type=TargetType,
-	 target=TargetHost,
-	 naming=Naming,
-	 master=MasterNode,
-	 cookie=MasterCookie,
-	 slave_targets=SlaveTargets} = Parameters,
-
-    lists:foreach(fun(T) -> maybe_reboot_target({TargetType,T}) end,
-		  [list_to_atom(TargetHost)|SlaveTargets]),
-
-    Cmd0 = get_main_target_start_command(TargetType,TargetHost,Naming,
-					 MasterNode,MasterCookie),
-    Cmd = 
-	case os:getenv("TEST_SERVER_FRAMEWORK") of
-	    FW when FW =:= false; FW =:= "undefined" -> Cmd0;
-	    FW -> Cmd0 ++ " -env TEST_SERVER_FRAMEWORK " ++ FW
-	end,
-	
-    {ok,LSock} = gen_tcp:listen(?MAIN_PORT,[binary,{reuseaddr,true},{packet,2}]),
-    case start_target(TargetType,TargetHost,Cmd) of
-	{ok,TargetClient,AcceptTimeout} ->
-	    case gen_tcp:accept(LSock,AcceptTimeout) of
-		{ok,Sock} -> 
-		    gen_tcp:close(LSock),
-		    receive 
-			{tcp,Sock,Bin} when is_binary(Bin) ->
-			    case unpack(Bin) of
-				error ->
-				    gen_tcp:close(Sock),
-				    close_target_client(TargetClient),
-				    {error,bad_message};
-				{ok,{target_info,TI}} ->
-				    put(test_server_free_targets,SlaveTargets),
-				    {ok, TI#target_info{where=Sock,
-							host=TargetHost,
-							naming=Naming,
-							master=MasterNode,
-							target_client=TargetClient,
-							slave_targets=SlaveTargets}}
-			    end;
-			{tcp_closed,Sock} ->
-			    gen_tcp:close(Sock),
-			    close_target_client(TargetClient),
-			    {error,could_not_contact_target}
-		    after AcceptTimeout ->
-			    gen_tcp:close(Sock),
-			    close_target_client(TargetClient),
-			    {error,timeout}
-		    end;
-		Error -> 
-		    %%! maybe something like kill_target(...)???
-		    gen_tcp:close(LSock),
-		    close_target_client(TargetClient),
-		    {error,{could_not_contact_target,Error}}
-	    end;
-	Error ->
-	    gen_tcp:close(LSock),
-	    {error,{could_not_start_target,Error}}
-    end.
-
 stop(TI) ->
-    kill_nodes(TI),
-    case TI#target_info.where of
-	local -> % there is no remote target to stop
-	    ok;
-	Sock ->  % stop remote target
-	    gen_tcp:close(Sock),
-	    close_target_client(TI#target_info.target_client)	    
-    end.
+    kill_nodes(TI).
 
 nodedown(Sock, TI) ->
     Match = #slave_info{name='$1',socket=Sock,client='$2',_='_'},
@@ -146,14 +75,8 @@ nodedown(Sock, TI) ->
 		false -> ok
 	    end,
 	    slave_died;
-	[] -> 
-	    case TI#target_info.where of
-		Sock ->
-		    %% test_server_ctrl will do the cleanup
-		    target_died;
-		_ -> 
-		    ignore
-	    end
+	[] ->
+	    ok
     end.
 
 
@@ -167,10 +90,7 @@ start_tracer_node(TraceFile,TI) ->
     Match = #slave_info{name='$1',_='_'},
     SlaveNodes = lists:map(fun([N]) -> [" ",N] end,
 			   ets:match(slave_tab,Match)),
-    TargetNode = case TI#target_info.where of
-		     local -> node();
-		     _ -> "test_server@" ++ TI#target_info.host
-		 end,
+    TargetNode = node(),
     Cookie = TI#target_info.cookie,
     {ok,LSock} = gen_tcp:listen(0,[binary,{reuseaddr,true},{packet,2}]),
     {ok,TracePort} = inet:port(LSock),
@@ -471,129 +391,29 @@ start_node_slave(SlaveName, OptList, From, TI) ->
     Ret = 
 	case start_which_node(OptList) of
 	    {error,Reason} -> {{error,Reason},undefined,undefined};
-	    Host0 -> do_start_node_slave(Host0,SlaveName,Args,Prog,Cleanup,TI)
+	    Host0 -> do_start_node_slave(Host0,SlaveName,Args,Prog,Cleanup)
 	end,
     gen_server:reply(From,Ret).
 
 
-do_start_node_slave(Host0, SlaveName, Args, Prog, Cleanup, TI) ->
-    case TI#target_info.where of
-	local ->
-	    Host = 
-		case Host0 of
-		    local -> test_server_sup:hoststr();
-		    _ -> cast_to_list(Host0)
-		end,
-	    Cmd = Prog ++ " " ++ Args,
-	    %% Can use slave.erl here because I'm both controller and target
-	    %% so I will ping the new node anyway
-	    case slave:start(Host, SlaveName, Args, no_link, Prog) of
-		{ok,Nodename} -> 
-		    case Cleanup of
-			true -> ets:insert(slave_tab,#slave_info{name=Nodename});
-			false -> ok
-		    end,
-		    {{ok,Nodename}, Host, Cmd, [], []};
-		Ret -> 
-		    {Ret, Host, Cmd}
-	    end;
-    
-	_Sock ->
-	    %% Cannot use slave.erl here because I'm only controller, and will
-	    %% not ping the new node. Only target shall contact the new node!!
-	    no_contact_start_slave(Host0,SlaveName,Args,Prog,Cleanup,TI)
-    end.
-
-
-
-no_contact_start_slave(Host, Name, Args0, Prog, Cleanup,TI) ->
-    Args1 = case string:str(Args0,"-setcookie") of
-		0 -> "-setcookie " ++ TI#target_info.cookie ++ " " ++ Args0;
-		_ -> Args0
+do_start_node_slave(Host0, SlaveName, Args, Prog, Cleanup) ->
+    Host =
+	case Host0 of
+	    local -> test_server_sup:hoststr();
+	    _ -> cast_to_list(Host0)
+	end,
+    Cmd = Prog ++ " " ++ Args,
+    %% Can use slave.erl here because I'm both controller and target
+    %% so I will ping the new node anyway
+    case slave:start(Host, SlaveName, Args, no_link, Prog) of
+	{ok,Nodename} ->
+	    case Cleanup of
+		true -> ets:insert(slave_tab,#slave_info{name=Nodename});
+		false -> ok
 	    end,
-    Args = TI#target_info.naming ++ " " ++ cast_to_list(Name) ++ " " ++ Args1,
-    case Host of
-	local ->
-	    case get(test_server_free_targets) of
-		[] ->
-		    io:format("Starting slave ~p on HOST~n", [Name]),
-		    TargetType = test_server_sup:get_os_family(),
-		    Cmd0 = get_slave_node_start_command(TargetType,
-							Prog,
-							TI#target_info.master),
-		    Cmd = Cmd0 ++ " " ++ Args,
-		    do_no_contact_start_slave(TargetType,
-					      test_server_sup:hoststr(),
-					      Cmd, Cleanup,TI, false);
-		[H|T] ->
-		    TargetType = TI#target_info.os_family,
-		    Cmd0 = get_slave_node_start_command(TargetType,
-							Prog,
-							TI#target_info.master),
-		    Cmd = Cmd0 ++ " " ++ Args,
-		    case do_no_contact_start_slave(TargetType,H,Cmd,Cleanup,
-						   TI,true) of
-			{error,remove} ->
-			    io:format("Cannot start node on ~p, "
-				      "removing from slave "
-				      "target list.", [H]),
-			    put(test_server_free_targets,T),
-			    no_contact_start_slave(Host,Name,Args,Prog,
-						   Cleanup,TI);
-			{error,keep} ->
-			    %% H is added to the END OF THE LIST 
-			    %% in order to avoid the same target to
-			    %% be selected each time
-			    put(test_server_free_targets,T++[H]),
-			    no_contact_start_slave(Host,Name,Args,Prog,
-						   Cleanup,TI);
-			R ->
-			    put(test_server_free_targets,T),
-			    R
-		    end
-	    end;
-	_ -> 
-	    TargetType = TI#target_info.os_family,
-	    Cmd0 = get_slave_node_start_command(TargetType,
-						Prog,
-						TI#target_info.master),
-	    Cmd = Cmd0 ++ " " ++ Args,
-	    do_no_contact_start_slave(TargetType, Host, Cmd, Cleanup, TI, false)
-    end.
-
-do_no_contact_start_slave(TargetType,Host0,Cmd0,Cleanup,TI,Retry) ->
-    %% Must use TargetType instead of TI#target_info.os_familiy here 
-    %% because if there were no free_targets we will be starting the 
-    %% slave node on host which might have a different os_familiy
-    Host = cast_to_list(Host0),
-    {ok,LSock} = gen_tcp:listen(0,[binary,
-				    {reuseaddr,true},
-				    {packet,2}]),
-    {ok,WaitPort} = inet:port(LSock),
-    Cmd = lists:concat([Cmd0, " -s ", ?MODULE, " node_started ", 
-			test_server_sup:hoststr(), " ", WaitPort]),
-
-    case start_target(TargetType,Host,Cmd) of
-	{ok,Client,AcceptTimeout} ->
-	    case wait_for_node_started(LSock,AcceptTimeout,
-				       Client,Cleanup,TI,self()) of
-		{error,_}=WaitError -> 
-		    if Retry ->
-			    case maybe_reboot_target(Client) of
-				{error,_} -> {error,remove};
-				ok -> {error,keep}
-			    end;
-		       true ->
-			    {WaitError,Host,Cmd}
-		    end;
-		{Ok,Warning} -> 
-		    {Ok,Host,Cmd,[],Warning}
-	    end;
-	StartError ->
-	    gen_tcp:close(LSock),
-	    if Retry -> {error,remove};
-	       true -> {{error,{could_not_start_target,StartError}},Host,Cmd}
-	    end
+	    {{ok,Nodename}, Host, Cmd, [], []};
+	Ret ->
+	    {Ret, Host, Cmd}
     end.
 
 
@@ -777,40 +597,10 @@ kill_node(SI,TI) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% Platform specific code
 
-start_target(unix,TargetHost,Cmd0) ->
-    Cmd = 
-	case test_server_sup:hoststr() of
-	    TargetHost -> Cmd0;
-	    _ -> lists:concat(["rsh ",TargetHost, " ", Cmd0])
-	end,
-    open_port({spawn, Cmd}, [stream]),
-    {ok,undefined,?ACCEPT_TIMEOUT}.
-
-maybe_reboot_target(_) ->
-    {error, cannot_reboot_target}.
-
 close_target_client(undefined) ->
     ok.
 
 
-
-%%
-%% Command for starting main target
-%% 
-get_main_target_start_command(unix,_TargetHost,Naming,
-			      _MasterNode,_MasterCookie) ->
-    Prog = pick_erl_program(default),
-    Prog ++ " " ++  Naming ++ " test_server" ++
-	" -boot start_sasl -sasl errlog_type error"
-	" -s test_server start " ++ test_server_sup:hoststr().
-
-%% 
-%% Command for starting slave nodes
-%% 
-get_slave_node_start_command(unix, Prog, MasterNode) ->
-    cast_to_list(Prog) ++ " -detached -master " ++ MasterNode.
-
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% cast_to_list(X) -> string()
 %%% X = list() | atom() | void()