Merge branch 'hans/ssh/ssh_controller_timeout/ERIERL-581/OTP-17173' into maint-23

* hans/ssh/ssh_controller_timeout/ERIERL-581/OTP-17173:
  ssh: Fix crash of controller
  ssh: Longer timeout for controller calls

1 files changed, 15 insertions, 7 deletions

diff --git a/lib/ssh/src/ssh_controller.erl b/lib/ssh/src/ssh_controller.erl
index 4b8d10c3c1..d8fbc8d0f2 100644
--- a/lib/ssh/src/ssh_controller.erl
+++ b/lib/ssh/src/ssh_controller.erl
@@ -60,11 +60,13 @@ start_link(Role, RegName) ->
 %% Internal application API
 %%====================================================================
 
+-define(TIMEOUT, 30000).
+
 start_system_subsystem(Controller, Sup, Host, Port, Profile, Options, ChildSpec) ->
-    gen_server:call(Controller, {start_system_subsystem, Sup, Host, Port, Profile, Options, ChildSpec}).
+    gen_server:call(Controller, {start_system_subsystem, Sup, Host, Port, Profile, Options, ChildSpec}, ?TIMEOUT).
 
 stop_system(Controller, SysSup) ->
-    gen_server:call(Controller, {stop_system,SysSup}).
+    gen_server:call(Controller, {stop_system,SysSup}, ?TIMEOUT).
 
 %%====================================================================
 %% Internal process state
@@ -102,11 +104,17 @@ handle_call({start_system_subsystem, Sup, Address, Port, Profile, Options, Child
 
 
 handle_call({stop_system,SysSup}, _From, D) ->
-    case supervisor:which_children(SysSup) of
-        [] ->
-            ssh_system_sup:stop_system(D#data.role, SysSup);
-        _X ->
-            ok
+    try
+        case supervisor:which_children(SysSup) of
+            [] ->
+                ssh_system_sup:stop_system(D#data.role, SysSup);
+            _X ->
+                ok
+        end
+    catch
+        _:_ ->
+            %% Already stopped (?)
+            skip
     end,
     {reply, ok, D}.