From 24c67e110e2219c269454566126ad0885ee57bdc Mon Sep 17 00:00:00 2001 From: Niclas Eklund Date: Wed, 6 Oct 2010 15:19:22 +0200 Subject: In some cases a crash report was generated when a connection was closing down. This was caused by a race condition between two processes. --- lib/ssh/src/ssh.appup.src | 12 ++++++------ lib/ssh/src/ssh_connection_handler.erl | 16 ++++++++++++---- 2 files changed, 18 insertions(+), 10 deletions(-) (limited to 'lib/ssh/src') diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src index 82114c9afd..09249e5e39 100644 --- a/lib/ssh/src/ssh.appup.src +++ b/lib/ssh/src/ssh.appup.src @@ -19,9 +19,9 @@ {"%VSN%", [ - {"1.1.10", [{load_module, ssh_connection_manager, soft_purge, soft_purge, []}]}, - {"1.1.9", [{load_module, ssh_channel, soft_purge, soft_purge, []}, - {load_module, ssh_connection_manager, soft_purge, soft_purge, []}]}, + {"1.1.11", [{restart_application, ssh}]}, + {"1.1.10", [{restart_application, ssh}]}, + {"1.1.9", [{restart_application, ssh}]}, {"1.1.8", [{restart_application, ssh}]}, {"1.1.7", [{restart_application, ssh}]}, {"1.1.6", [{restart_application, ssh}]}, @@ -31,9 +31,9 @@ {"1.1.2", [{restart_application, ssh}]} ], [ - {"1.1.10", [{load_module, ssh_connection_manager, soft_purge, soft_purge, []}]}, - {"1.1.9", [{load_module, ssh_channel, soft_purge, soft_purge, []}, - {load_module, ssh_connection_manager, soft_purge, soft_purge, []}]}, + {"1.1.11", [{restart_application, ssh}]}, + {"1.1.10", [{restart_application, ssh}]}, + {"1.1.9", [{restart_application, ssh}]}, {"1.1.8", [{restart_application, ssh}]}, {"1.1.7", [{restart_application, ssh}]}, {"1.1.6", [{restart_application, ssh}]}, diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl index 822ef8f8f9..926d4fddce 100644 --- a/lib/ssh/src/ssh_connection_handler.erl +++ b/lib/ssh/src/ssh_connection_handler.erl @@ -705,11 +705,19 @@ generate_event(<> = Msg, StateName, Byte == ?SSH_MSG_CHANNEL_REQUEST; Byte == ?SSH_MSG_CHANNEL_SUCCESS; Byte == ?SSH_MSG_CHANNEL_FAILURE -> - ssh_connection_manager:event(Pid, Msg), - State = generate_event_new_state(State0, EncData), - next_packet(State), - {next_state, StateName, State}; + try + ssh_connection_manager:event(Pid, Msg), + State = generate_event_new_state(State0, EncData), + next_packet(State), + {next_state, StateName, State} + catch + exit:{noproc, _Reason} -> + Report = io_lib:format("~p Connection Handler terminated: ~p~n", + [self(), Pid]), + error_logger:info_report(Report), + {stop, normal, State0} + end; generate_event(Msg, StateName, State0, EncData) -> Event = ssh_bits:decode(Msg), State = generate_event_new_state(State0, EncData), -- cgit v1.2.3 From 00d27caa001444e65e9dd3a7d3bc65cfde4b5866 Mon Sep 17 00:00:00 2001 From: Niclas Eklund Date: Mon, 25 Oct 2010 12:16:36 +0200 Subject: The fix regarding OTP-8863 was not included in the previous version as stated --- lib/ssh/src/ssh.appup.src | 2 ++ lib/ssh/src/ssh_system_sup.erl | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'lib/ssh/src') diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src index 09249e5e39..160e336873 100644 --- a/lib/ssh/src/ssh.appup.src +++ b/lib/ssh/src/ssh.appup.src @@ -19,6 +19,7 @@ {"%VSN%", [ + {"1.1.12", [{load_module, ssh_system_sup, soft_purge, soft_purge, []}]}, {"1.1.11", [{restart_application, ssh}]}, {"1.1.10", [{restart_application, ssh}]}, {"1.1.9", [{restart_application, ssh}]}, @@ -31,6 +32,7 @@ {"1.1.2", [{restart_application, ssh}]} ], [ + {"1.1.12", [{load_module, ssh_system_sup, soft_purge, soft_purge, []}]}, {"1.1.11", [{restart_application, ssh}]}, {"1.1.10", [{restart_application, ssh}]}, {"1.1.9", [{restart_application, ssh}]}, diff --git a/lib/ssh/src/ssh_system_sup.erl b/lib/ssh/src/ssh_system_sup.erl index 0ff73f1648..d1003e12f2 100644 --- a/lib/ssh/src/ssh_system_sup.erl +++ b/lib/ssh/src/ssh_system_sup.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2009. All Rights Reserved. +%% Copyright Ericsson AB 2008-2010. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -85,7 +85,7 @@ start_subsystem(SystemSup, Options) -> supervisor:start_child(SystemSup, Spec). stop_subsystem(SystemSup, SubSys) -> - case lists:keyfind(SubSys, 2, supervisor:which_children(SystemSup)) of + case catch lists:keyfind(SubSys, 2, supervisor:which_children(SystemSup)) of false -> {error, not_found}; {Id, _, _, _} -> -- cgit v1.2.3