File 0170-alloc_SUITE-distribution_SUITE-fix-race-co... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0170-alloc_SUITE-distribution_SUITE-fix-race-conditions.patch of Package erlang (Revision ea0af7f25aff7fcba1c32352dbc0c599)

Currently displaying revision ea0af7f25aff7fcba1c32352dbc0c599 , Show latest

From d2bccf4a4a9060995868b8e7a4f91865ccdffd8d Mon Sep 17 00:00:00 2001
From: Maxim Fedorov <dane@whatsapp.com>
Date: Tue, 23 Mar 2021 21:30:18 -0700
Subject: [PATCH] alloc_SUITE, distribution_SUITE: fix race conditions

Distribution suite suffers from the race between logger warning emitted, and "true" printed by the test code. There seems to be no specific order, logger may print before or after test suite outpit.
Alloc may fail when stop_node stops the node really fast, and linked process causes test case to exit with `{'EXIT', noconnection}`
---
 erts/emulator/test/alloc_SUITE.erl        | 6 +++---
 erts/emulator/test/distribution_SUITE.erl | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/erts/emulator/test/alloc_SUITE.erl b/erts/emulator/test/alloc_SUITE.erl
index 97cd90d72c..ebc60b3cc2 100644
--- a/erts/emulator/test/alloc_SUITE.erl
+++ b/erts/emulator/test/alloc_SUITE.erl
@@ -197,11 +197,11 @@ erts_mmap_do(Config, SCO, SCRPM, SCRFSD) ->
                     {false, {os,_}} -> ok
                 end,
 
-                Self ! {Ref, ok}
+                exit(ok)
         end,
 
-    spawn_link(Node, F),
-    Result = receive {Ref, Rslt} -> Rslt end,
+    {Pid, MRef} = spawn_monitor(Node, F),
+    Result = receive {'DOWN', MRef, process, Pid, Rslt} -> Rslt end,
     stop_node(Node),
     Result.
 
diff --git a/erts/emulator/test/distribution_SUITE.erl b/erts/emulator/test/distribution_SUITE.erl
index 128c9b07e0..43b7474ac0 100644
--- a/erts/emulator/test/distribution_SUITE.erl
+++ b/erts/emulator/test/distribution_SUITE.erl
@@ -857,9 +857,9 @@ stop_dist(Config) when is_list(Config) ->
                  ++ " -noshell -pa "
                  ++ proplists:get_value(data_dir, Config)
                  ++ " -s run"),
-    %% The "true" may be followed by an error report, so ignore anything that
-    %% follows it.
-    "true\n"++_ = Str,
+    %% The "true" may be followed or prepended by an error report
+    Lines = string:lexemes(Str, "\n"),
+    true = lists:member("true", Lines),
 
     %% "May fail on FreeBSD due to differently configured name lookup - ask Arndt",
     %% if you can find him.
-- 
2.26.2

Places

File 0170-alloc_SUITE-distribution_SUITE-fix-race-conditions.patch of Package erlang (Revision ea0af7f25aff7fcba1c32352dbc0c599)

Places