cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #4920 from iffy/ansible

Browse source 
Collect all stdout over ssh transport before returning data
This commit is contained in:
Matt Haggard 2013-11-15 12:19:10 -07:00 committed by James Tanner
parent 441cd1c5b9
commit 389602b8dd
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/ansible/runner/connection_plugins/ssh.py
View file

@ -216,8 +216,9 @@ class Connection(object):
# We can't use p.communicate here because the ControlMaster may have stdout open as well
stdout = ''
stderr = ''
rpipes = [p.stdout, p.stderr]
while True:
rfd, wfd, efd = select.select([p.stdout, p.stderr], [], [p.stdout, p.stderr], 1)
rfd, wfd, efd = select.select(rpipes, [], rpipes, 1)
# fail early if the sudo password is wrong
if self.runner.sudo and sudoable and self.runner.sudo_pass:
@ -230,15 +231,14 @@ class Connection(object):
dat = os.read(p.stdout.fileno(), 9000)
stdout += dat
if dat == '':
p.wait()
break
elif p.stderr in rfd:
rpipes.remove(p.stdout)
if p.stderr in rfd:
dat = os.read(p.stderr.fileno(), 9000)
stderr += dat
if dat == '':
p.wait()
break
elif p.poll() is not None:
rpipes.remove(p.stderr)
if not rpipes or p.poll() is not None:
p.wait()
break
stdin.close() # close stdin after we read from stdout (see also issue #848)