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

remove node_object comparison and use the full dict to eliminate issues comparing obj and compare instead the whole node object with the node objects in the list

Browse Source
This commit is contained in:
Rebeccah
2020-01-21 16:15:01 -05:00
parent 4fe9e5da14
commit 82dd4a3884
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -228,15 +228,18 @@ class WorkflowDAG(SimpleDAG):
obj.do_not_run = True obj.do_not_run = True
nodes_marked_do_not_run.append(node) nodes_marked_do_not_run.append(node)
else: else:
# import sdb
# sdb.set_trace()
for p in parent_nodes: for p in parent_nodes:
child_nodes = []
if p.job.status == "successful": if p.job.status == "successful":
child_nodes = (c['node_object'] for c in self.get_children(p, "success_nodes")) child_nodes = [x for x in self.get_children(p, "success_nodes")]
elif p.job.status == "failure": elif p.job.status == "failed":
child_nodes = (c['node_object'] for c in self.get_children(p, "failure_nodes")) child_nodes = [x for x in self.get_children(p, "failure_nodes")]
else: child_nodes.extend(x for x in self.get_children(p, "always_nodes"))
child_nodes = (c['node_object'] for c in self.get_children(p, "always_nodes")) if node not in child_nodes:
if not any(obj == x for x in child_nodes):
obj.do_not_run = True obj.do_not_run = True
nodes_marked_do_not_run.append(node) nodes_marked_do_not_run.append(node)
break
return [n['node_object'] for n in nodes_marked_do_not_run] return [n['node_object'] for n in nodes_marked_do_not_run]