close in test... but doesn't close in DFK ... so that needs to happen too (and be tested)

(see different patch)

it should be the responsibility of the DFK to close channels (at least in that other patch)
and so that's why this test, which avoids the DFK, needs to close channels itself

but looks like channel.close() doesn't close down threads enough?
I can see it now closes the transport - the transport thread is now reported as unconnected,
prior to calling close it was reporting itself as connected. but how to make the transport
thread go away entirely?

it looks like the thread goes away "eventually" - a 20s sleep for example, is long enough
- so how to do that with joins?

Author: benclifford

parsl/channels/ssh/ssh.py

@@ -219,8 +219,20 @@ def pull_file(self, remote_source, local_dir):
 
     def close(self) -> None:
         if self._is_connected():
+            transport = self.ssh_client.get_transport()
             self.ssh_client.close()
 
+            # ssh_client.close calls transport.close, but transport.close does
+            # not always wait for the transport thread to be stopped. See impl
+            # of Transport.close in paramiko and issue
+            # https://github.com/paramiko/paramiko/issues/520
+            logger.debug("Waiting for transport thread to stop")
+            transport.join(30)
+            if transport.is_alive():
+                logger.warning("SSH transport thread did not shut down")
+            else:
+                logger.debug("SSH transport thread stopped")
+
     def isdir(self, path):
         """Return true if the path refers to an existing directory.
 

parsl/tests/test_providers/test_local_provider.py

@@ -91,13 +91,17 @@ def test_ssh_channel():
                 # already exist, so create it here.
                 pathlib.Path('{}/known.hosts'.format(config_dir)).touch(mode=0o600)
                 script_dir = tempfile.mkdtemp()
-                p = LocalProvider(channel=SSHChannel('127.0.0.1', port=server_port,
-                                                     script_dir=remote_script_dir,
-                                                     host_keys_filename='{}/known.hosts'.format(config_dir),
-                                                     key_filename=priv_key),
-                                  launcher=SingleNodeLauncher(debug=False))
-                p.script_dir = script_dir
-                _run_tests(p)
+                channel = SSHChannel('127.0.0.1', port=server_port,
+                                     script_dir=remote_script_dir,
+                                     host_keys_filename='{}/known.hosts'.format(config_dir),
+                                     key_filename=priv_key)
+                try:
+                    p = LocalProvider(channel=channel,
+                                      launcher=SingleNodeLauncher(debug=False))
+                    p.script_dir = script_dir
+                    _run_tests(p)
+                finally:
+                    channel.close()
         finally:
             _stop_sshd(sshd_thread)