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

Multi-ancestor detector added.

Browse Source
This commit is contained in:
Aaron Tan
2016-10-25 18:53:31 -04:00
parent 2792555510
commit ad04015c9f
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/api/views.py
View File

@@ -71,7 +71,6 @@ from awx.api.metadata import RoleMetadata
from awx.main.consumers import emit_channel_notification from awx.main.consumers import emit_channel_notification
from awx.main.scheduler.dag_simple import SimpleDAG from awx.main.scheduler.dag_simple import SimpleDAG
logger = logging.getLogger('awx.api.views') logger = logging.getLogger('awx.api.views')
def api_exception_handler(exc, context): def api_exception_handler(exc, context):
@@ -2677,7 +2676,10 @@ class WorkflowJobTemplateNodeChildrenBaseList(EnforceParentRelationshipMixin, Su
graph.add_edge(parent, sub, self.relationship) graph.add_edge(parent, sub, self.relationship)
if graph.cycle_detected(): if graph.cycle_detected():
return {"Error": "cycle detected!"} return {"Error": "Cycle detected!"}
if graph.multi_ancestor_detected():
return {"Error": "Multiple ancestor detected!"}
return None return None

13
awx/main/scheduler/dag_simple.py
View File

@@ -174,3 +174,16 @@ class SimpleDAG(object):
self._clean_meta() self._clean_meta()
return False return False
def multi_ancestor_detected(self):
for node in self.nodes:
node['metadata'] = {"ancestor": None}
for edge in self.edges:
if self.nodes[edge[1]]['metadata']['ancestor'] is None:
self.nodes[edge[1]]['metadata']['ancestor'] = self.nodes[edge[0]]
else:
self._clean_meta()
return True
self._clean_meta()
return False