Added backwards compatible host output object for storing host output. Updated get_output to use host output. Added embedded server race condition waiting time

Author: Dan

embedded_server/embedded_server.py

@@ -234,8 +234,9 @@ def _handle_ssh_connection(transport, fail_auth=False,
         return
     # *Important* Allow other greenlets to execute before establishing connection
     # which may be handled by said other greenlets
-    gevent.sleep(1)
+    gevent.sleep(2)
     channel = transport.accept(20)
+    gevent.sleep(0)
     if not channel:
         logger.error("Could not establish channel")
         return
@@ -245,6 +246,7 @@ def _handle_ssh_connection(transport, fail_auth=False,
     while not channel.send_ready():
         gevent.sleep(.2)
     channel.close()
+    gevent.sleep(0)
 
 def handle_ssh_connection(sock,
                           fail_auth=False, ssh_exception=False,

pssh/output.py

@@ -0,0 +1,30 @@
+class HostOutput(dict):
+    __slots__ = ('host', 'cmd', 'channel', 'stdout', 'stderr', 'stdin', 'exit_code', 'exception')
+
+    def __init__(self, host, cmd, channel, stdout, stderr, stdin, exit_code=None, exception=None):
+        dict.__init__(self, (('host', host), ('cmd', cmd), ('channel', channel),
+                             ('stdout', stdout), ('stderr', stderr),
+                             ('stdin', stdin), ('exit_code', exit_code),
+                             ('exception', exception)))
+        self.host = host
+        self.cmd = cmd
+        self.channel = channel
+        self.stdout = stdout
+        self.stderr = stderr
+        self.stdin = stdin
+        self.exception = exception
+        self.exit_code = exit_code
+
+    def __setattr__(self, name, value):
+        object.__setattr__(self, name, value)
+        dict.__setitem__(self, name, value)
+
+    def update(self, update_dict):
+        dict.update(self, update_dict)
+        for key in update_dict:
+            object.__setattr__(self, key, update_dict[key])
+
+    def __repr__(self):
+        return "host=%s, cmd=%s, channel=%s, stdout=%s, stderr=%s, stdin=%s, \
+exception=%s" % (self.host, self.cmd, self.channel, self.stdout, self.stdin,
+                 self.stderr, self.exception,)

pssh/pssh_client.py

@@ -34,6 +34,7 @@
 from .exceptions import HostArgumentException
 from .constants import DEFAULT_RETRIES
 from .ssh_client import SSHClient
+from .output import HostOutput
 
 
 logger = logging.getLogger('pssh')
@@ -722,23 +723,16 @@ def _update_host_output(self, output, host, exit_code, channel, stdout,
             logger.warning("Already have output for host %s - changing host "
                            "key for %s to %s", host, host, new_host)
             host = new_host
-        output.setdefault(host, {})
-        output[host].update({
-            'exit_code': exit_code,
-            'channel': channel,
-            'stdout': stdout,
-            'stderr': stderr,
-            'stdin': stdin,
-            'cmd': cmd,
-            'exception': exception,})
+        output[host] = HostOutput(host, cmd, channel, stdout, stderr, stdin,
+                                  exception=exception)
 
     def join(self, output):
         """Block until all remote commands in output have finished
         and retrieve exit codes"""
         for host in output:
-            output[host]['cmd'].join()
-            if output[host]['channel']:
-                output[host]['channel'].recv_exit_status()
+            output[host].cmd.join()
+            if output[host].channel:
+                output[host].channel.recv_exit_status()
         self.get_exit_codes(output)
 
     def finished(self, output):
@@ -761,7 +755,7 @@ def get_exit_codes(self, output):
         :rtype: None
         """
         for host in output:
-            output[host].update({'exit_code': self.get_exit_code(output[host])})
+            output[host].exit_code = self.get_exit_code(output[host])
 
     def get_exit_code(self, host_output):
         """Get exit code from host output *if available*.