External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-14 17:50:02 -03:30
Code Issues Packages Projects Releases Wiki Activity

handle job error state in convergence

Browse Source
This commit is contained in:
chris meyers
2018-11-01 17:44:23 -04:00
parent 7b751ea2ff
commit 44b19245c2
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
awx/main/scheduler/dag_workflow.py
View File

@@ -50,7 +50,7 @@ class WorkflowDAG(SimpleDAG):
return False return False
# Node decidedly got a job; check if job is done # Node decidedly got a job; check if job is done
if p.job and p.job.status not in ['successful', 'failed']: if p.job and p.job.status not in ['successful', 'failed', 'error']:
return False return False
return True return True
@@ -69,7 +69,7 @@ class WorkflowDAG(SimpleDAG):
continue continue
if obj.job: if obj.job:
if obj.job.status == 'failed': if obj.job.status in ['failed', 'error']:
nodes.extend(self.get_dependencies(obj, 'failure_nodes') + nodes.extend(self.get_dependencies(obj, 'failure_nodes') +
self.get_dependencies(obj, 'always_nodes')) self.get_dependencies(obj, 'always_nodes'))
elif obj.job.status == 'successful': elif obj.job.status == 'successful':
@@ -121,9 +121,9 @@ class WorkflowDAG(SimpleDAG):
else: else:
is_failed = True if children_all else job.status in ['failed', 'canceled', 'error'] is_failed = True if children_all else job.status in ['failed', 'canceled', 'error']
if job.status in ['canceled', 'error']: if job.status == 'canceled':
continue continue
elif job.status == 'failed': elif job.status in ['error', 'failed']:
nodes.extend(children_failed + children_always) nodes.extend(children_failed + children_always)
elif job.status == 'successful': elif job.status == 'successful':
nodes.extend(children_success + children_always) nodes.extend(children_success + children_always)
@@ -168,7 +168,7 @@ class WorkflowDAG(SimpleDAG):
if node in (self.get_dependencies(p, 'success_nodes') + if node in (self.get_dependencies(p, 'success_nodes') +
self.get_dependencies(p, 'always_nodes')): self.get_dependencies(p, 'always_nodes')):
return False return False
elif p.job.status == 'failed': elif p.job.status in ['failed', 'error']:
if node in (self.get_dependencies(p, 'failure_nodes') + if node in (self.get_dependencies(p, 'failure_nodes') +
self.get_dependencies(p, 'always_nodes')): self.get_dependencies(p, 'always_nodes')):
return False return False
@@ -203,7 +203,7 @@ class WorkflowDAG(SimpleDAG):
self.get_dependencies(obj, 'failure_nodes') + self.get_dependencies(obj, 'failure_nodes') +
self.get_dependencies(obj, 'always_nodes')) self.get_dependencies(obj, 'always_nodes'))
elif obj.job: elif obj.job:
if obj.job.status == 'failed': if obj.job.status in ['failed', 'error']:
nodes.extend(self.get_dependencies(obj, 'success_nodes')) nodes.extend(self.get_dependencies(obj, 'success_nodes'))
elif obj.job.status == 'successful': elif obj.job.status == 'successful':
nodes.extend(self.get_dependencies(obj, 'failure_nodes')) nodes.extend(self.get_dependencies(obj, 'failure_nodes'))