Skip to content

A
ansible
Commit 0a0e9817 by jctanner
Options

Merge pull request #5879 from lberruti/ssh_slow_fix 

Fix slow ssh
parents 1f9de0c0 75b7a1d9
Showing with 6 additions and 0 deletions
lib/ansible/runner/connection_plugins/ssh.py
...@@ -303,6 +303,9 @@ class Connection(object): ...@@ -303,6 +303,9 @@ class Connection(object):
# Calling wait while there are still pipes to read can cause a lock # Calling wait while there are still pipes to read can cause a lock
elif not rpipes and p.poll() == None: elif not rpipes and p.poll() == None:
p.wait() 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) stdin.close() # close stdin after we read from stdout (see also issue #848)
if C.HOST_KEY_CHECKING and not_in_host_file: if C.HOST_KEY_CHECKING and not_in_host_file:
......
lib/ansible/runner/connection_plugins/ssh_old.py
...@@ -261,6 +261,9 @@ class Connection(object): ...@@ -261,6 +261,9 @@ class Connection(object):
# Calling wait while there are still pipes to read can cause a lock # Calling wait while there are still pipes to read can cause a lock
elif not rpipes and p.poll() == None: elif not rpipes and p.poll() == None:
p.wait() 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) stdin.close() # close stdin after we read from stdout (see also issue #848)
if C.HOST_KEY_CHECKING and not_in_host_file: if C.HOST_KEY_CHECKING and not_in_host_file:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment