File 1321-erts-Unlink-with-nc-checker-to-avoid-nocon... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1321-erts-Unlink-with-nc-checker-to-avoid-noconnect-signa.patch of Package erlang (Revision c748a2a486c28cc59c31b4e462087f03)

Currently displaying revision c748a2a486c28cc59c31b4e462087f03 , Show latest

From 9a02967c07b7f0b9c727111f1e3575a8f36b4ef1 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Fri, 26 Nov 2021 11:12:17 +0100
Subject: [PATCH 10/11] erts: Unlink with nc checker to avoid noconnect signal

There was a race in the shutdown where the node would
exit before the normal exit signal was sent which would
case the testcase to fail with a noconnection exit signal.
---
 erts/emulator/test/node_container_SUITE.erl | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/erts/emulator/test/node_container_SUITE.erl b/erts/emulator/test/node_container_SUITE.erl
index 161968fe0d..3f781170a4 100644
--- a/erts/emulator/test/node_container_SUITE.erl
+++ b/erts/emulator/test/node_container_SUITE.erl
@@ -1011,25 +1011,27 @@ nc_refc_check(Node) when is_atom(Node) ->
     Ref = make_ref(),
     Self = self(),
     io:format("Starting reference count check of node ~w~n", [Node]),
-    spawn_link(Node,
-               fun () ->
-                       {{node_references, NodeRefs},
-                        {dist_references, DistRefs}} = ?ND_REFS,
-                       check_nd_refc({node(), erlang:system_info(creation)},
-                                     NodeRefs,
-                                     DistRefs,
-                                     fun (ErrMsg) ->
-                                             Self ! {Ref, ErrMsg, failed},
-                                             exit(normal)
-                                     end),
-                       Self ! {Ref, succeded}
-               end),
+    Pid = spawn_link(
+            Node,
+            fun () ->
+                    {{node_references, NodeRefs},
+                     {dist_references, DistRefs}} = ?ND_REFS,
+                    check_nd_refc({node(), erlang:system_info(creation)},
+                                  NodeRefs,
+                                   DistRefs,
+                                   fun (ErrMsg) ->
+                                           Self ! {Ref, ErrMsg, failed},
+                                            exit(normal)
+                                   end),
+                    Self ! {Ref, succeded}
+            end),
     receive
         {Ref, ErrorMsg, failed} ->
             io:format("~s~n", [ErrorMsg]),
             ct:fail(reference_count_check_failed);
         {Ref, succeded} ->
             io:format("Reference count check of node ~w succeded!~n", [Node]),
+            unlink(Pid),
             ok
     end.
 
-- 
2.31.1

Places

File 1321-erts-Unlink-with-nc-checker-to-avoid-noconnect-signa.patch of Package erlang (Revision c748a2a486c28cc59c31b4e462087f03)

Places