Merge branch 'master' of github.com:coreos-inc/quay

This commit is contained in:
Jake Moshenko 2015-01-29 18:40:24 -05:00
commit fb533a1f4c
4 changed files with 22 additions and 13 deletions

View file

@ -121,7 +121,7 @@ class BuilderServer(object):
def _job_heartbeat(self, build_job):
WorkQueue.extend_processing(build_job.job_item, seconds_from_now=JOB_TIMEOUT_SECONDS,
retry_count=1, minimum_extension=MINIMUM_JOB_EXTENSION)
minimum_extension=MINIMUM_JOB_EXTENSION)
def _job_complete(self, build_job, job_status):
if job_status == BuildJobResult.INCOMPLETE:
@ -155,6 +155,7 @@ class BuilderServer(object):
except BuildJobLoadException as irbe:
logger.exception(irbe)
self._queue.incomplete(job_item, restore_retry=False)
continue
logger.debug('Build job found. Checking for an avaliable worker.')
scheduled = yield From(self._lifecycle_manager.schedule(build_job))