diff options
| author | Stefan Grundmann <[email protected]> | 2010-09-01 19:42:57 +0200 |
|---|---|---|
| committer | nick <[email protected]> | 2010-09-02 16:54:14 +0200 |
| commit | 6c61c2169e635bcf100e128096f66a9334035c7b (patch) | |
| tree | b44f6d05d4a5e50c7599239a2065d6c319fe0069 | |
| parent | f673a2e5b4ae4bb2c3ecf4716b5e34b394cc4c08 (diff) | |
| download | otp-6c61c2169e635bcf100e128096f66a9334035c7b.tar.gz otp-6c61c2169e635bcf100e128096f66a9334035c7b.tar.bz2 otp-6c61c2169e635bcf100e128096f66a9334035c7b.zip | |
fix process leak in ssh_system_sup (dynamicaly created childs where not cleaned up)
The ssh_system_sup supervisor supervises one ssh_subsystem_sup process for
every client connection. There was no functionality to free resources
(terminate_child/ delete_child) when a client connection was closed.
Which lead to one ssh_subsystem_sup and one ssh_channel_sup process left over.
This commit adds ssh_system_sup:stop_subsystem/2 and code that calls it
in ssh_connection_manager:terminate/2.
| -rw-r--r-- | lib/ssh/src/ssh_connection_manager.erl | 7 | ||||
| -rw-r--r-- | lib/ssh/src/ssh_system_sup.erl | 13 |
2 files changed, 18 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh_connection_manager.erl b/lib/ssh/src/ssh_connection_manager.erl index 9e55312e5f..6bf89224cf 100644 --- a/lib/ssh/src/ssh_connection_manager.erl +++ b/lib/ssh/src/ssh_connection_manager.erl @@ -560,13 +560,18 @@ handle_info({'EXIT', _, _}, State) -> %% The return value is ignored. %%-------------------------------------------------------------------- terminate(Reason, #state{connection_state = - #connection{requests = Requests}, + #connection{requests = Requests, + sub_system_supervisor = SubSysSup}, opts = Opts}) -> SSHOpts = proplists:get_value(ssh_opts, Opts), disconnect_fun(Reason, SSHOpts), (catch lists:foreach(fun({_, From}) -> gen_server:reply(From, {error, connection_closed}) end, Requests)), + Address = proplists:get_value(address, Opts), + Port = proplists:get_value(port, Opts), + SystemSup = ssh_system_sup:system_supervisor(Address, Port), + ssh_system_sup:stop_subsystem(SystemSup, SubSysSup), ok. %%-------------------------------------------------------------------- diff --git a/lib/ssh/src/ssh_system_sup.erl b/lib/ssh/src/ssh_system_sup.erl index 477f60f993..9336f59444 100644 --- a/lib/ssh/src/ssh_system_sup.erl +++ b/lib/ssh/src/ssh_system_sup.erl @@ -33,7 +33,7 @@ stop_system/2, system_supervisor/2, subsystem_supervisor/1, channel_supervisor/1, connection_supervisor/1, - acceptor_supervisor/1, start_subsystem/2, restart_subsystem/2, restart_acceptor/2]). + acceptor_supervisor/1, start_subsystem/2, restart_subsystem/2, restart_acceptor/2, stop_subsystem/2]). %% Supervisor callback -export([init/1]). @@ -83,6 +83,17 @@ start_subsystem(SystemSup, Options) -> Spec = ssh_subsystem_child_spec(Options), supervisor:start_child(SystemSup, Spec). +stop_subsystem(SystemSup, SubSys) -> + case lists:keyfind(SubSys, 2, supervisor:which_children(SystemSup)) of + false -> + {error, not_found}; + {Id, _, _, _} -> + spawn(fun() -> supervisor:terminate_child(SystemSup, Id), + supervisor:delete_child(SystemSup, Id) end), + ok + end. + + restart_subsystem(Address, Port) -> SysSupName = make_name(Address, Port), SubSysName = id(ssh_subsystem_sup, Address, Port), |