File 0184-kernel-Fix-hanging-net_kernel.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0184-kernel-Fix-hanging-net_kernel.patch of Package erlang (Revision e6fae69e60dcc1918fd2bc4ae52e9ff8)

Currently displaying revision e6fae69e60dcc1918fd2bc4ae52e9ff8 , Show latest

From 34d0f7f014e1a3dccd5d1e98a3ccb4348ba037ca Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Thu, 3 Jun 2021 18:06:47 +0200
Subject: [PATCH] kernel: Fix hanging net_kernel

Symptom: net_kernel hanging waiting for {'EXIT', OldOwner, _}

Problem: OldOwner has already exited and the exit message has already
been handled. This is possible to happen because
erts_internal:abort_pending_connection can return false in
pending_nodedown() which does not change the connection state in
sys_dist ETS table. I does however remove the owner pid from
state.conn_owners which this fix uses.
---
 lib/kernel/src/net_kernel.erl | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/lib/kernel/src/net_kernel.erl b/lib/kernel/src/net_kernel.erl
index b857000a80..4c8dd1e2b5 100644
--- a/lib/kernel/src/net_kernel.erl
+++ b/lib/kernel/src/net_kernel.erl
@@ -796,12 +796,17 @@ handle_info({AcceptPid, {accept_pending,MyNode,Node,Address,Type}}, State) ->
 		    %% change pending process.
 		    %%
 		    OldOwner = Conn#connection.owner,
-		    ?debug({net_kernel, remark, old, OldOwner, new, AcceptPid}),
-		    exit(OldOwner, remarked),
-		    receive
-			{'EXIT', OldOwner, _} ->
-			    true
-		    end,
+                    case maps:is_key(OldOwner, State#state.conn_owners) of
+                        true ->
+                            ?debug({net_kernel, remark, old, OldOwner, new, AcceptPid}),
+                            exit(OldOwner, remarked),
+                            receive
+                                {'EXIT', OldOwner, _} ->
+                                    true
+                            end;
+                        false ->
+                            ok % Owner already exited
+                    end,
 		    ets:insert(sys_dist, Conn#connection{owner = AcceptPid}),
 		    AcceptPid ! {self(),{accept_pending,ok_pending}},
                     Owners = maps:remove(OldOwner, State#state.conn_owners),
-- 
2.26.2

Places

File 0184-kernel-Fix-hanging-net_kernel.patch of Package erlang (Revision e6fae69e60dcc1918fd2bc4ae52e9ff8)

Places