Merge pull request ansible#5879 from lberruti/ssh_slow_fix

Fix slow ssh
lvh · Feb 5, 2014 · 0a0e981 · 0a0e981
2 parents 1f9de0c + 75b7a1d
commit 0a0e981
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/lib/ansible/runner/connection_plugins/ssh.py b/lib/ansible/runner/connection_plugins/ssh.py
@@ -303,6 +303,9 @@ def exec_command(self, cmd, tmp_path, sudo_user=None, sudoable=False, executable
             # Calling wait while there are still pipes to read can cause a lock
             elif not rpipes and p.poll() == None:
                 p.wait()
+                # the process has finished and the pipes are empty,
+                # if we loop and do the select it waits all the timeout
+                break
         stdin.close() # close stdin after we read from stdout (see also issue #848)
 
         if C.HOST_KEY_CHECKING and not_in_host_file:

diff --git a/lib/ansible/runner/connection_plugins/ssh_old.py b/lib/ansible/runner/connection_plugins/ssh_old.py
@@ -261,6 +261,9 @@ def exec_command(self, cmd, tmp_path, sudo_user=None, sudoable=False, executable
             # Calling wait while there are still pipes to read can cause a lock
             elif not rpipes and p.poll() == None:
                 p.wait()
+                # the process has finished and the pipes are empty,
+                # if we loop and do the select it waits all the timeout
+                break
         stdin.close() # close stdin after we read from stdout (see also issue #848)
 
         if C.HOST_KEY_CHECKING and not_in_host_file: