External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-23 08:37:48 -02:30
Code Issues Packages Projects Releases Wiki Activity

redid some formatting and syntax per personal preferences, comments on PR, and suggestions from @jrb

Browse Source
This commit is contained in:
Rebeccah
2020-01-27 14:44:36 -05:00
parent 04844aa44f
commit a419547731
1 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -91,7 +91,7 @@ class WorkflowDAG(SimpleDAG):
nodes.extend(self.get_children(obj, 'failure_nodes') + nodes.extend(self.get_children(obj, 'failure_nodes') +
self.get_children(obj, 'always_nodes')) self.get_children(obj, 'always_nodes'))
else: else:
if self._are_relevant_parents_finished(n) is True: if self._are_relevant_parents_finished(n):
nodes_found.append(n) nodes_found.append(n)
return [n['node_object'] for n in nodes_found] return [n['node_object'] for n in nodes_found]
@@ -196,7 +196,7 @@ class WorkflowDAG(SimpleDAG):
return False return False
else: else:
return False return False
elif p.do_not_run is False and p.unified_job_template is None: elif not p.do_not_run and p.unified_job_template is None:
if node in (self.get_children(p, 'failure_nodes') + if node in (self.get_children(p, 'failure_nodes') +
self.get_children(p, 'always_nodes')): self.get_children(p, 'always_nodes')):
return False return False
@@ -211,31 +211,31 @@ class WorkflowDAG(SimpleDAG):
for node in self.sort_nodes_topological(): for node in self.sort_nodes_topological():
obj = node['node_object'] obj = node['node_object']
parent_nodes = [p['node_object'] for p in self.get_parents(obj)] parent_nodes = [p['node_object'] for p in self.get_parents(obj)]
if obj.do_not_run is False and not obj.job and node not in root_nodes and not obj.all_parents_must_converge: if not obj.do_not_run and not obj.job and node not in root_nodes:
if self._are_all_nodes_dnr_decided(parent_nodes): if self._are_all_nodes_dnr_decided(parent_nodes):
if self._should_mark_node_dnr(node, parent_nodes): # if the current node is a convergence node and all the
obj.do_not_run = True # parents are finished then check to see if all parents
nodes_marked_do_not_run.append(node) # met the needed criteria to run the convergence child
if obj.do_not_run is False and obj.all_parents_must_converge and not obj.job: # (i.e. parent must fail, parent must succeed)
if self._are_all_nodes_dnr_decided(parent_nodes): if obj.all_parents_must_converge:
if self._are_relevant_parents_finished(node): if self._are_relevant_parents_finished(node):
# if the current node is a convergence node and all the if any(p.do_not_run for p in parent_nodes):
# parents are finished then check to see if all parents obj.do_not_run = True
# met the needed criteria to run the convergence child nodes_marked_do_not_run.append(node)
# (i.e. parent must fail, parent must succeed) else:
if any(p.do_not_run for p in parent_nodes): for p in parent_nodes:
if p.job.status == "successful":
status = "success_nodes"
elif p.job.status == "failed":
status = "failure_nodes"
if (p not in [node['node_object'] for node in self.get_parents(obj, status)]
and p not in [node['node_object'] for node in self.get_parents(obj, "always_nodes")]):
obj.do_not_run = True
nodes_marked_do_not_run.append(node)
break
else:
if self._should_mark_node_dnr(node, parent_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)
else:
for p in parent_nodes:
if p.job.status == "successful":
status = "success_nodes"
elif p.job.status == "failed":
status = "failure_nodes"
if (p not in [node['node_object'] for node in self.get_parents(obj, status)]
and p not in [node['node_object'] for node in self.get_parents(obj, "always_nodes")]):
obj.do_not_run = True
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]