External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-01 06:35:26 -02:30
Code Issues Packages Projects Releases Wiki Activity

correct stop DNR propogation

Browse Source 
* If a child has a parent that is not in the finished state then do not
propogate the DNR to the child in question.
* If a parent is in a finished state; do not propogate the DNR to the
child if the path to the child is traversed (based on the parent job
status).
This commit is contained in:
chris meyers
2018-10-15 09:48:00 -04:00
committed by mabashian
parent 1a064bdc59
commit ff6db37a95
2 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -120,15 +120,30 @@ class WorkflowDAG(SimpleDAG):
if not job and obj.do_not_run is False and n not in root_nodes:
parent_nodes = [p['node_object'] for p in self.get_dependents(obj)]
all_parents_dnr = True
parent_run_path = False
for p in parent_nodes:
if not p.job and p.do_not_run is False:
all_parents_dnr = False
break
elif p.job and p.job.status in ['new', 'pending', 'waiting', 'running']:
parent_run_path = True
elif p.job and p.job.status == 'successful':
if n in self.get_dependencies(p, 'success_nodes'):
parent_run_path = True
elif p.job and p.job.status == 'failed':
children_failed = self.get_dependencies(p, 'failure_nodes')
children_always = self.get_dependencies(p, 'always_nodes')
if n in children_always or n in children_failed:
parent_run_path = True
#all_parents_dnr = reduce(lambda p: bool(p.do_not_run == True), parent_nodes)
if all_parents_dnr:
if all_parents_dnr and parent_run_path is False:
obj.do_not_run = True
nodes_marked_do_not_run.append(n)
if obj.do_not_run:
children_success = self.get_dependencies(obj, 'success_nodes')
children_failed = self.get_dependencies(obj, 'failure_nodes')