Files
zuul/zuul/ansible/base/library/zuul_console.py
T
Ian Wienand 9462c9e466 zuul_console: fix python 3 support
send() requires a bytes-like object in Python 3, ensure the error
message is encoded correctly.

---

Some debugging notes might come in handy for the future here.  This
problem appeared in a fairly specific part of the test cases when
setting "ansible_python_interpreter" to /usr/bin/python3.  The remote
streaming test has a task that is designed to fail [1]:

 - hosts: all
   tasks:
     - name: Remote shell task with python exception
       command: echo foo
       args:
         chdir: /remote-shelltask/somewhere/that/does/not/exist
       failed_when: false

We see that Ansible ships over a payload and tries to run it, but it
raises an exception very early.

 <192.168.122.1> SSH: EXEC ssh -C ...  '/bin/sh -c '"'"'/usr/bin/python3 && sleep 0'"'"''
 <192.168.122.1> Failed to connect to the host via ssh:
 Traceback (most recent call last):
   File "<stdin>", line 114, in <module>
   File "<stdin>", line 106, in _ansiballz_main
   ...
   File "/tmp/ansible_command_payload_tieedyzs/__main__.py", line 263, in main
 FileNotFoundError: [Errno 2] No such file or directory: '/remote-shelltask/somewhere/that/does/not/exist'

When this task started, the Ansible task callbacks in the zuul_stream
callback plugin have setup a thread that listens for the console
output being sent by the remote zuul_console daemon started earlier in
the playbook [2].  This listening thread is sitting in a recv()
waiting for some streaming data to log [3].

There will be no remote log file for zuul_console to stream back,
because this task failed before it even got started.  What should
happen is the "[Zuul] Log not found" message should be sent back and
logic in [4] will match this and stop this thread.

When this does *not* happen, such as when this send() raises an
exception because of wrong data type, the task ends anyway and Ansible
moves on to make the end-of-task callbacks in zuul_stream (actually
there's a bunch of looping happening, but let's ignore those details).
This ends up in _stop_streamers() [5] which attempts to join(30) the
streaming thread.  Under normal circumstances, this thread should be
finished and the join() successful.  However, because the target
thread is stuck in a recv(), the 30-second timeout begins.  The clue
to this is in the logs you eventually get:

 [Zuul] Log Stream did not terminate

So eventually, Zuul would have made progress here and given up on
waiting for the thread to finish properly.  However, 30 seconds is a
long time to the unit-test and pushes the job over it's timeout.

Thus your end result is that when using Python 3 Zuul aborts the job,
and the test rather mysteriously fails!

[1] 3f8b36aa0b/tests/fixtures/config/remote-zuul-stream/git/org_project/playbooks/command.yaml (L93)
[2] 3f8b36aa0b/tests/fixtures/config/remote-zuul-stream/git/org_project/playbooks/command.yaml (L93)
[3] 3f8b36aa0b/zuul/ansible/base/callback/zuul_stream.py (L14)
[4] 3f8b36aa0b/zuul/ansible/base/callback/zuul_stream.py (L174)
[5] 3f8b36aa0b/zuul/ansible/base/callback/zuul_stream.py (L271)

This is tested in the follow-on I2b3bc6d4f873b7d653cfaccd1598464583c561e7

Change-Id: I7cdcfc760975871f7fa9949da1015d7cec92ee67
2019-09-18 13:58:45 +10:00

326 lines
9.7 KiB
Python
Executable File

#!/usr/bin/python
# Copyright (c) 2016 IBM Corp.
#
# This module is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This software is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this software. If not, see <http://www.gnu.org/licenses/>.
import glob
import os
import sys
import select
import socket
import subprocess
import threading
import time
LOG_STREAM_FILE = '/tmp/console-{log_uuid}.log'
LOG_STREAM_PORT = 19885
def daemonize():
# A really basic daemonize method that should work well enough for
# now in this circumstance. Based on the public domain code at:
# http://web.archive.org/web/20131017130434/http://www.jejik.com/articles/2007/02/a_simple_unix_linux_daemon_in_python/
pid = os.fork()
if pid > 0:
return True
os.chdir('/')
os.setsid()
os.umask(0)
pid = os.fork()
if pid > 0:
sys.exit(0)
sys.stdout.flush()
sys.stderr.flush()
i = open('/dev/null', 'r')
o = open('/dev/null', 'a+')
e = open('/dev/null', 'ab+', 0)
os.dup2(i.fileno(), sys.stdin.fileno())
os.dup2(o.fileno(), sys.stdout.fileno())
os.dup2(e.fileno(), sys.stderr.fileno())
return False
class Console(object):
def __init__(self, path):
self.path = path
self.file = open(path, 'rb')
self.stat = os.stat(path)
self.size = self.stat.st_size
class Server(object):
MAX_REQUEST_LEN = 1024
REQUEST_TIMEOUT = 10
def __init__(self, path, port):
self.path = path
s = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
s.setsockopt(socket.SOL_SOCKET,
socket.SO_REUSEADDR, 1)
s.bind(('::', port))
s.listen(1)
self.socket = s
def accept(self):
conn, addr = self.socket.accept()
return conn
def run(self):
while True:
conn = self.accept()
t = threading.Thread(target=self.handleOneConnection, args=(conn,))
t.daemon = True
t.start()
def chunkConsole(self, conn, log_uuid):
try:
console = Console(self.path.format(log_uuid=log_uuid))
except Exception:
return
while True:
chunk = console.file.read(4096)
if not chunk:
break
conn.send(chunk)
return console
def followConsole(self, console, conn):
while True:
# As long as we have unread data, keep reading/sending
while True:
chunk = console.file.read(4096)
if chunk:
conn.send(chunk)
else:
break
# At this point, we are waiting for more data to be written
time.sleep(0.5)
# Check to see if the remote end has sent any data, if so,
# discard
r, w, e = select.select([conn], [], [conn], 0)
if conn in e:
return False
if conn in r:
ret = conn.recv(1024)
# Discard anything read, if input is eof, it has
# disconnected.
if not ret:
return False
# See if the file has been truncated
try:
st = os.stat(console.path)
if (st.st_ino != console.stat.st_ino or
st.st_size < console.size):
return True
except Exception:
return True
console.size = st.st_size
def get_command(self, conn):
poll = select.poll()
bitmask = (select.POLLIN | select.POLLERR |
select.POLLHUP | select.POLLNVAL)
poll.register(conn, bitmask)
buffer = b''
ret = None
start = time.time()
while True:
elapsed = time.time() - start
timeout = max(self.REQUEST_TIMEOUT - elapsed, 0)
if not timeout:
raise Exception("Timeout while waiting for input")
for fd, event in poll.poll(timeout):
if event & select.POLLIN:
buffer += conn.recv(self.MAX_REQUEST_LEN)
else:
raise Exception("Received error event")
if len(buffer) >= self.MAX_REQUEST_LEN:
raise Exception("Request too long")
try:
ret = buffer.decode('utf-8')
x = ret.find('\n')
if x > 0:
return ret[:x]
except UnicodeDecodeError:
pass
def handleOneConnection(self, conn):
log_uuid = self.get_command(conn)
# use path split to make use the input isn't trying to be clever
# and construct some path like /tmp/console-/../../something
log_uuid = os.path.split(log_uuid.rstrip())[-1]
# FIXME: this won't notice disconnects until it tries to send
console = None
try:
while True:
if console is not None:
try:
console.file.close()
except Exception:
pass
while True:
console = self.chunkConsole(conn, log_uuid)
if console:
break
conn.send(b'[Zuul] Log not found\n')
time.sleep(0.5)
while True:
if self.followConsole(console, conn):
break
else:
return
finally:
try:
conn.close()
except Exception:
pass
def get_inode(port_number=19885):
for netfile in ('/proc/net/tcp6', '/proc/net/tcp'):
if not os.path.exists(netfile):
continue
with open(netfile) as f:
# discard header line
f.readline()
for line in f:
# sl local_address rem_address st tx_queue:rx_queue tr:tm->when
# retrnsmt uid timeout inode
fields = line.split()
# Format is localaddr:localport in hex
port = int(fields[1].split(':')[1], base=16)
if port == port_number:
return fields[9]
def get_pid_from_inode(inode):
my_euid = os.geteuid()
exceptions = []
for d in os.listdir('/proc'):
try:
try:
int(d)
except Exception:
continue
d_abs_path = os.path.join('/proc', d)
if os.stat(d_abs_path).st_uid != my_euid:
continue
fd_dir = os.path.join(d_abs_path, 'fd')
if os.path.exists(fd_dir):
if os.stat(fd_dir).st_uid != my_euid:
continue
for fd in os.listdir(fd_dir):
try:
fd_path = os.path.join(fd_dir, fd)
if os.path.islink(fd_path):
target = os.readlink(fd_path)
if '[' + inode + ']' in target:
return d, exceptions
except Exception as e:
exceptions.append(e)
except Exception as e:
exceptions.append(e)
return None, exceptions
def test():
s = Server(LOG_STREAM_FILE, LOG_STREAM_PORT)
s.run()
def main():
module = AnsibleModule(
argument_spec=dict(
path=dict(default=LOG_STREAM_FILE),
port=dict(default=LOG_STREAM_PORT, type='int'),
state=dict(default='present', choices=['absent', 'present']),
)
)
p = module.params
path = p['path']
port = p['port']
state = p['state']
if state == 'present':
if daemonize():
module.exit_json()
s = Server(path, port)
s.run()
else:
pid = None
exceptions = []
inode = get_inode(port)
if not inode:
module.fail_json(
msg="Could not find inode for port",
exceptions=[])
pid, exceptions = get_pid_from_inode(inode)
if not pid:
except_strings = [str(e) for e in exceptions]
module.fail_json(
msg="Could not find zuul_console process for inode",
exceptions=except_strings)
try:
subprocess.check_output(['kill', pid])
except subprocess.CalledProcessError as e:
module.fail_json(
msg="Could not kill zuul_console pid",
exceptions=[str(e)])
for fn in glob.glob(LOG_STREAM_FILE.format(log_uuid='*')):
try:
os.unlink(fn)
except Exception as e:
module.fail_json(
msg="Could not remove logfile {fn}".format(fn=fn),
exceptions=[str(e)])
module.exit_json()
from ansible.module_utils.basic import * # noqa
from ansible.module_utils.basic import AnsibleModule
#
# To debug this, you can run it with arguments specified on the
# command-line in a json file. e.g.
#
# $ cat args.json
# {"ANSIBLE_MODULE_ARGS": {
# "state": "present"
# }
# }
#
# Then from a virtualenv with Ansible installed you can run
#
# $ ./ansible-env/bin/python ./zuul_console.py args.json
#
if __name__ == '__main__':
main()