Fixed host output de-duplication for more than 2 identical hosts. Workaround for gevent/threading import race condition. Resolves #46

Author: Dan

pssh/pssh_client.py

@@ -18,15 +18,18 @@
 
 """Package containing ParallelSSHClient class."""
 
-
+import sys
+if 'threading' in sys.modules:
+    del sys.modules['threading']
 from gevent import monkey
 monkey.patch_all()
 import logging
 import gevent.pool
 import gevent.hub
 gevent.hub.Hub.NOT_ERROR = (Exception,)
 import warnings
-import hashlib
+import string
+import random
 from .constants import DEFAULT_RETRIES
 from .ssh_client import SSHClient
 
@@ -137,7 +140,7 @@ def __init__(self, hosts,
         ``exit_code`` in ``output`` will be ``None`` if command has not finished.
         
         ``get_exit_codes`` is not a blocking function and will not wait for commands
-        to finish. Use ``client.pool.join()`` to block until all commands have
+        to finish. Use ``client.join(output)`` to block until all commands have
         finished.
         
         ``output`` parameter is modified in-place.
@@ -169,7 +172,7 @@ def __init__(self, hosts,
           
           >>> client = ParallelSSHClient(['localhost'])
           >>> output = client.run_command('ls -ltrh /tmp/aasdfasdf')
-          >>> client.pool.join()
+          >>> client.join(output)
           
           :netstat: ``tcp        0      0 127.0.0.1:53054         127.0.0.1:22            ESTABLISHED``
           
@@ -239,9 +242,9 @@ def run_command(self, *args, **kwargs):
         0
         0
         
-        *Wait for completion, no stdout*
+        *Wait for completion, no stdout printing*
         
-        >>> client.pool.join()
+        >>> client.join(output)
         
         *Run with sudo*
         
@@ -269,7 +272,7 @@ def run_command(self, *args, **kwargs):
         **Do not stop on errors, return per-host exceptions in output**
         
         >>> output = client.run_command('ls -ltrh', stop_on_errors=False)
-        >>> client.pool.join()
+        >>> client.join(output)
         >>> print output
         
         ::
@@ -376,7 +379,10 @@ def _update_host_output(self, output, host, exit_code, channel, stdout, stderr,
                             exception=None):
         """Update host output with given data"""
         if host in output:
-            new_host = "_".join([host, hashlib.sha1().hexdigest()[:10]])
+            new_host = "_".join([host,
+                                 ''.join(random.choice(
+                                     string.ascii_lowercase + string.digits)
+                                     for _ in xrange(8))])
             logger.warning("Already have output for host %s - changing host key for %s to %s",
                            host, host, new_host)
             host = new_host

pssh/ssh_client.py

@@ -18,7 +18,9 @@
 
 """Package containing SSHClient class."""
 
-
+import sys
+if 'threading' in sys.modules:
+    del sys.modules['threading']
 import gevent
 from gevent import monkey
 monkey.patch_all()

tests/test_pssh_client.py

@@ -426,17 +426,17 @@ def test_bash_variable_substitution(self):
     def test_identical_host_output(self):
         """Test that we get output when running with duplicated hosts"""
         # Make socket with no server listening on it just for testing output
-        _socket = make_socket(self.host)
-        port = _socket.getsockname()[1]
-        hosts = [self.host, self.host]
+        _socket1, _socket2 = make_socket(self.host), make_socket(self.host)
+        port = _socket1.getsockname()[1]
+        hosts = [self.host, self.host, self.host]
         client = ParallelSSHClient(hosts, port=port,
                                    pkey=self.user_key)
         output = client.run_command(self.fake_cmd, stop_on_errors=False)
         client.pool.join()
         self.assertEqual(len(hosts), len(output.keys()),
                          msg="Host list contains %s identical hosts, only got output for %s" % (
                              len(hosts), len(output.keys())))
-        del _socket
+        del _socket1, _socket2
 
     def test_connection_error_exception(self):
         """Test that we get connection error exception in output with correct arguments"""