File 1315-system-test-Add-printouts-during-the-node-... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1315-system-test-Add-printouts-during-the-node-start.patch of Package erlang

From 39b073ec2cf48a5af5cf2130326019d2112cd1b4 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Fri, 15 Oct 2021 16:19:53 +0200
Subject: [PATCH 2/3] [system|test] Add printouts during the node start

OTP-17615
---
 erts/test/upgrade_SUITE.erl | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/erts/test/upgrade_SUITE.erl b/erts/test/upgrade_SUITE.erl
index b050f7e61d..121384e64a 100644
--- a/erts/test/upgrade_SUITE.erl
+++ b/erts/test/upgrade_SUITE.erl
@@ -520,19 +520,33 @@ wait_node_up(ExpStatus,ExpVsn,ExpApps0) ->
     wait_node_up(Node,ExpStatus,ExpVsn,lists:keysort(1,ExpApps),60).
 
 wait_node_up(Node,ExpStatus,ExpVsn,ExpApps,0) ->
+    p("wait_node_up -> fail"),
     ct:fail({app_check_failed,ExpVsn,ExpApps,
 	     rpc:call(Node,release_handler,which_releases,[ExpStatus]),
 	     rpc:call(Node,application,which_applications,[])});
 wait_node_up(Node,ExpStatus,ExpVsn,ExpApps,N) ->
     timer:sleep(2000),
+    p("wait_node_up -> [~w] get release vsn and apps", [N]),
     case {rpc:call(Node,release_handler,which_releases,[ExpStatus]),
 	  rpc:call(Node, application, which_applications, [])} of
 	{[{_,ExpVsn,_,_}],Apps} when is_list(Apps) ->
+	    p("wait_node_up -> [~w] expected release vsn", [N]),
 	    case [{A,V} || {A,_,V} <- lists:keysort(1,Apps)] of
-		ExpApps -> {ok,Node};
-		_ -> wait_node_up(Node,ExpStatus,ExpVsn,ExpApps,N-1)
+		ExpApps ->
+		    p("wait_node_up -> [~w] expected apps", [N]),
+		    {ok, Node};
+		UnexpApps ->
+		    p("wait_node_up -> [~w] still wrong apps:"
+		      "~n      ~p", [N, UnexpApps]),
+		    wait_node_up(Node,ExpStatus,ExpVsn,ExpApps,N-1)
 	    end;
-	_ ->
+	{[{_,Vsn,_,_}],_} ->
+	    p("wait_node_up -> [~w] still wrong release vsn:"
+	      "~n      ~p", [N, Vsn]),
+	    wait_node_up(Node,ExpStatus,ExpVsn,ExpApps,N-1);
+	X ->
+	    p("wait_node_up -> [~w] unexpected results:"
+	      "~n      ~p", [N, X]),
 	    wait_node_up(Node,ExpStatus,ExpVsn,ExpApps,N-1)
     end.
 
-- 
2.31.1

Places

File 1315-system-test-Add-printouts-during-the-node-start.patch of Package erlang

Places