wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add fix to read correct socket path recieved from ansible-connection (#27560)

Browse source 
Currently socket path is send from `ansible-connection` (running as background
process) over stdout. This can conflict with debug logs that are also send on
stdout resulting in incorrect socket path received by the main process.

To avoid this add a socket path delimiter string which is recevied by
main process and socket path is retrieved based on delimiter string.

This implementation will change in future when ansible-connection
framework is made more robust.
This commit is contained in:
Ganesh Nalawade 2017-08-01 19:32:25 +05:30 committed by GitHub
parent aa19563388
commit bb998a3cd2
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/ansible-connection
View file

@ -249,7 +249,7 @@ class Server():
break break
time.sleep(1) time.sleep(1)
timeout -= 1 timeout -= 1
return (0, self.socket_path, '') return 0, b'\n#SOCKET_PATH#: %s\n' % self.socket_path, ''
def communicate(sock, data): def communicate(sock, data):

20
lib/ansible/plugins/connection/persistent.py
View file

@ -66,11 +66,12 @@ class Connection(ConnectionBase):
(stdout, stderr) = p.communicate() (stdout, stderr) = p.communicate()
stdin.close() stdin.close()
return (p.returncode, stdout, stderr) return (p, stdout, stderr)
def exec_command(self, cmd, in_data=None, sudoable=True): def exec_command(self, cmd, in_data=None, sudoable=True):
super(Connection, self).exec_command(cmd, in_data=in_data, sudoable=sudoable) super(Connection, self).exec_command(cmd, in_data=in_data, sudoable=sudoable)
return self._do_it('EXEC: ' + cmd) p, out, err = self._do_it('EXEC: ' + cmd)
return p.returncode, out, err
def put_file(self, in_path, out_path): def put_file(self, in_path, out_path):
super(Connection, self).put_file(in_path, out_path) super(Connection, self).put_file(in_path, out_path)
@ -90,5 +91,16 @@ class Connection(ConnectionBase):
socket path exists. If the path exists (or the timeout has expired), socket path exists. If the path exists (or the timeout has expired),
returns the socket path. returns the socket path.
""" """
rc, out, err = self._do_it('RUN:') p, out, err = self._do_it('RUN:')
return to_text(out, errors='surrogate_or_strict') while True:
out = out.strip()
if out == b'':
# EOF file found
return None
elif out.startswith(b'#SOCKET_PATH#'):
break
else:
out = p.stdout.readline()
socket_path = out.split(b'#SOCKET_PATH#: ', 1)[1]
return to_text(socket_path, errors='surrogate_or_strict')