From 2b669382325ff328e66ffa5a5eb413478f691a01 Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Thu, 25 Aug 2011 17:09:03 -0700 Subject: [PATCH] queue: delete every job when it finishes, so only running jobs are buried --- teuthology/queue.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/teuthology/queue.py b/teuthology/queue.py index 089944460a8f7..7614190a0520d 100644 --- a/teuthology/queue.py +++ b/teuthology/queue.py @@ -72,17 +72,19 @@ describe. One job is run at a time. # bury the job so it won't be re-run if it fails job.bury() - run_job(job, ctx.archive_dir) + log.debug('Config is: %s', job.body) + job_config = yaml.safe_load(job.body) -def run_job(job, archive_dir): - log.info('Running job %d', job.jid) - log.debug('Config is: %s', job.body) - job_config = yaml.safe_load(job.body) + log.debug('Creating archive dir...') + safe_archive = safepath.munge(job_config['name']) + safepath.makedirs(ctx.archive_dir, safe_archive) + archive_path = os.path.join(ctx.archive_dir, safe_archive, str(job.jid)) - safe_archive = safepath.munge(job_config['name']) - safepath.makedirs(archive_dir, safe_archive) - archive_path = os.path.join(archive_dir, safe_archive, str(job.jid)) + log.info('Running job %d', job.jid) + run_job(job_config, archive_path) + job.delete() +def run_job(job_config, archive_path): arg = [ os.path.join(os.path.dirname(sys.argv[0]), 'teuthology'), ] @@ -113,7 +115,6 @@ def run_job(job, archive_dir): log.exception(e) else: log.info('Success!') - job.delete() finally: os.close(tmp_fp) os.unlink(tmp_path) -- 2.39.5