zuul
/
zuul
Code Issues Proposed changes

Merge "Retry job on broken process pool"

This commit is contained in:
Zuul 2021-04-07 16:39:19 +00:00 committed by Gerrit Code Review
parent fbbcff4ef1 741f6e4b36
commit 9c19b1adb2
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zuul/executor/server.py
View File

@ -1044,8 +1044,17 @@ class AnsibleJob(object):
task.wait()
if not task.success:
# On transient error retry the job
if hasattr(task, 'transient_error') and task.transient_error:
result = dict(
result=None,
error_detail=f'Failed to update project '
f'{task.project_name}')
self.job.sendWorkComplete(json.dumps(result))
return
raise ExecutorError(
'Failed to update project %s' % task.canonical_name)
'Failed to update project %s' % task.project_name)
self.project_info[task.canonical_name] = {
'refs': task.refs,
@ -2990,6 +2999,7 @@ class ExecutorServer(BaseMergeServer):
# requests.
log.exception('Process pool got broken')
self.resetProcessPool()
task.transient_error = True
except Exception:
log.exception('Got exception while updating repo %s/%s',
task.connection_name, task.project_name)