Test

This is to be done 10pm Mondayt 21 Sept 2020 to minimise interuption and allow Chris to recover if things go sideways.

tes/sshwrapper/__init__.py

@@ -113,12 +113,17 @@ class Ssh:
             if mode is not None and ctrlsocket not in sess.ctrl_processes:
                 os.unlink(ctrlsocket)
                 mode = None
+            if mode is not None and sess.ctrl_processes[ctrlsocket].returncode is not None:
+                ctrl_p = sess.ctrl_processes[ctrlsocket]
+                logger.debug('The control socket exists, but the process has returned {}'.format(ctrl_p.returncode))
+                (stderr,stdout) = ctrl_p.communicate()
+                logger.debug('ctrl_p stderr {}'.format(stderr))
+                logger.debug('ctrl_p stdout {}'.format(stdout))
+                os.unlink(ctrlsocket)
+                mode = None
+        # This is expected: It indicates there is not yet a control master for this user on this login node
         except FileNotFoundError as e:
             mode = None
-            logger.error('attempting to access control master socket raised exception')
-            logger.error(e)
-            import traceback
-            logger.error(traceback.format_exc())
         except Exception as e:
             logger.error('attempting to access control master socket raised exception')
             logger.error(e)