diff options
| author | Sverker Eriksson <[email protected]> | 2017-09-27 19:45:42 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2017-11-15 20:36:01 +0100 |
| commit | 6c4a3094d0263e46827c6b1869a6de0c033b6b64 (patch) | |
| tree | 82e4bc05244644f65bb564ddcae86bcdbd038b3d /lib | |
| parent | 0a6ccd3d1fb1d9cacd7369533d6e5aa1fc2ded77 (diff) | |
| download | otp-6c4a3094d0263e46827c6b1869a6de0c033b6b64.tar.gz otp-6c4a3094d0263e46827c6b1869a6de0c033b6b64.tar.bz2 otp-6c4a3094d0263e46827c6b1869a6de0c033b6b64.zip | |
Improve connection aborting
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/kernel/src/net_kernel.erl | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/lib/kernel/src/net_kernel.erl b/lib/kernel/src/net_kernel.erl index eee915b15b..fb17e7c1b6 100644 --- a/lib/kernel/src/net_kernel.erl +++ b/lib/kernel/src/net_kernel.erl @@ -796,19 +796,23 @@ handle_info({AcceptPid, {accept_pending,MyNode,Node,Address,Type}}, State) -> AcceptPid ! {self(), {accept_pending, already_pending}}, {noreply, State}; _ -> - ConnId = case (catch erlang:new_connection_id(Node)) of - {Nr,_DHandle}=CI when is_integer(Nr) -> CI - %% SVERK What to do? - end, - ets:insert(sys_dist, #connection{node = Node, - conn_id = ConnId, - state = pending, - owner = AcceptPid, - address = Address, - type = Type}), - AcceptPid ! {self(),{accept_pending,ok}}, - Owners = [{AcceptPid,Node} | State#state.conn_owners], - {noreply, State#state{conn_owners = Owners}} + case (catch erlang:new_connection_id(Node)) of + {Nr,_DHandle}=ConnId when is_integer(Nr) -> + ets:insert(sys_dist, #connection{node = Node, + conn_id = ConnId, + state = pending, + owner = AcceptPid, + address = Address, + type = Type}), + AcceptPid ! {self(),{accept_pending,ok}}, + Owners = [{AcceptPid,Node} | State#state.conn_owners], + {noreply, State#state{conn_owners = Owners}}; + + _ -> + error_logger:error_msg("~n** Cannot get connection id for node ~w~n", + [Node]), + AcceptPid ! {self(),{accept_pending,nok_pending}} + end end; handle_info({SetupPid, {is_pending, Node}}, State) -> @@ -1009,7 +1013,9 @@ up_pending_nodedown(Conn, Node, _Reason, _Type, State) -> AcceptPid = Conn#connection.pending_owner, Owners = State#state.conn_owners, Pend = lists:keydelete(AcceptPid, 1, State#state.pend_owners), + erlang:abort_connection_id(Node, Conn#connection.conn_id), Conn1 = Conn#connection { owner = AcceptPid, + conn_id = erlang:new_connection_id(Node), pending_owner = undefined, state = pending }, ets:insert(sys_dist, Conn1), |