zuul
/
zuul
Code Issues Proposed changes

Ansible launcher: add option to keep jobdir 

To aid in debugging.

Change-Id: Ice4478fd7b6d4121ed9f1c7c9bce1dcc57699a3a
This commit is contained in:
James E. Blair 2016-05-25 08:43:37 -07:00
parent 2a81aa2c2d
commit f87c5ce0e0
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zuul/cmd/launcher.py
View File

@ -46,6 +46,9 @@ class Launcher(zuul.cmd.ZuulApp):
parser.add_argument('--version', dest='version', action='version', parser.add_argument('--version', dest='version', action='version',
version=self._get_version(), version=self._get_version(),
help='show zuul version') help='show zuul version')
parser.add_argument('--keep-jobdir', dest='keep_jobdir',
action='store_true',
help='keep local jobdirs after run completes')
self.args = parser.parse_args() self.args = parser.parse_args()
def reconfigure_handler(self, signum, frame): def reconfigure_handler(self, signum, frame):
@ -73,7 +76,8 @@ class Launcher(zuul.cmd.ZuulApp):
self.log = logging.getLogger("zuul.Launcher") self.log = logging.getLogger("zuul.Launcher")
LaunchServer = zuul.launcher.ansiblelaunchserver.LaunchServer LaunchServer = zuul.launcher.ansiblelaunchserver.LaunchServer
self.launcher = LaunchServer(self.config) self.launcher = LaunchServer(self.config,
keep_jobdir=self.args.keep_jobdir)
self.launcher.start() self.launcher.start()
signal.signal(signal.SIGHUP, self.reconfigure_handler) signal.signal(signal.SIGHUP, self.reconfigure_handler)

16
zuul/launcher/ansiblelaunchserver.py
View File

@ -37,7 +37,8 @@ import zuul.ansible.plugins.callback_plugins
class JobDir(object): class JobDir(object):
def __init__(self): def __init__(self, keep=False):
self.keep = keep
self.root = tempfile.mkdtemp() self.root = tempfile.mkdtemp()
self.git_root = os.path.join(self.root, 'git') self.git_root = os.path.join(self.root, 'git')
os.makedirs(self.git_root) os.makedirs(self.git_root)
@ -56,15 +57,17 @@ class JobDir(object):
return self return self
def __exit__(self, etype, value, tb): def __exit__(self, etype, value, tb):
shutil.rmtree(self.root) if not self.keep:
shutil.rmtree(self.root)
class LaunchServer(object): class LaunchServer(object):
log = logging.getLogger("zuul.LaunchServer") log = logging.getLogger("zuul.LaunchServer")
section_re = re.compile('site "(.*?)"') section_re = re.compile('site "(.*?)"')
def __init__(self, config): def __init__(self, config, keep_jobdir=False):
self.config = config self.config = config
self.keep_jobdir = keep_jobdir
self.hostname = socket.gethostname() self.hostname = socket.gethostname()
self.node_workers = {} self.node_workers = {}
self.mpmanager = multiprocessing.Manager() self.mpmanager = multiprocessing.Manager()
@ -221,7 +224,7 @@ class LaunchServer(object):
self.sites, args['name'], args['host'], self.sites, args['name'], args['host'],
args['description'], args['labels'], args['description'], args['labels'],
self.hostname, self.zmq_send_queue, self.hostname, self.zmq_send_queue,
self.termination_queue) self.termination_queue, self.keep_jobdir)
self.node_workers[worker.name] = worker self.node_workers[worker.name] = worker
worker.process = multiprocessing.Process(target=worker.run) worker.process = multiprocessing.Process(target=worker.run)
@ -279,7 +282,7 @@ class LaunchServer(object):
class NodeWorker(object): class NodeWorker(object):
def __init__(self, config, jobs, builds, sites, name, host, def __init__(self, config, jobs, builds, sites, name, host,
description, labels, manager_name, zmq_send_queue, description, labels, manager_name, zmq_send_queue,
termination_queue): termination_queue, keep_jobdir):
self.log = logging.getLogger("zuul.NodeWorker.%s" % (name,)) self.log = logging.getLogger("zuul.NodeWorker.%s" % (name,))
self.log.debug("Creating node worker %s" % (name,)) self.log.debug("Creating node worker %s" % (name,))
self.config = config self.config = config
@ -299,6 +302,7 @@ class NodeWorker(object):
self.manager_name = manager_name self.manager_name = manager_name
self.zmq_send_queue = zmq_send_queue self.zmq_send_queue = zmq_send_queue
self.termination_queue = termination_queue self.termination_queue = termination_queue
self.keep_jobdir = keep_jobdir
self.running_job_lock = threading.Lock() self.running_job_lock = threading.Lock()
self._job_complete_event = threading.Event() self._job_complete_event = threading.Event()
self._running_job = False self._running_job = False
@ -540,7 +544,7 @@ class NodeWorker(object):
self.log.debug("Job %s: beginning" % (job.unique,)) self.log.debug("Job %s: beginning" % (job.unique,))
self.builds[job.unique] = self.name self.builds[job.unique] = self.name
with JobDir() as jobdir: with JobDir(self.keep_jobdir) as jobdir:
self.log.debug("Job %s: job root at %s" % self.log.debug("Job %s: job root at %s" %
(job.unique, jobdir.root)) (job.unique, jobdir.root))
timeout = self.prepareAnsibleFiles(jobdir, job, args) timeout = self.prepareAnsibleFiles(jobdir, job, args)