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

workflow variables processing, recursion detection

Browse Source
This commit is contained in:
AlanCoding
2018-10-01 16:04:55 -04:00
committed by Marliana Lara
parent faa6ee47c5
commit 01d1470544
2 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
awx/main/scheduler/task_manager.py
View File

@@ -26,6 +26,7 @@ from awx.main.models import (
ProjectUpdate,
SystemJob,
WorkflowJob,
WorkflowJobTemplate
)
from awx.main.scheduler.dag_workflow import WorkflowDAG
from awx.main.utils.pglock import advisory_lock
@@ -120,7 +121,25 @@ class TaskManager():
spawn_node.job = job
spawn_node.save()
logger.info('Spawned %s in %s for node %s', job.log_format, workflow_job.log_format, spawn_node.pk)
if job._resources_sufficient_for_launch():
can_start = True
if isinstance(spawn_node.unified_job_template, WorkflowJobTemplate):
workflow_ancestors = job.get_ancestor_workflows()
if spawn_node.unified_job_template.id in set(workflow_ancestors):
can_start = False
logger.info('Refusing to start recursive workflow-in-workflow id={}, wfjt={}, ancestors={}'.format(
job.id, spawn_node.unified_job_template.id, workflow_ancestors))
job.job_explanation = _(
"Workflow Job spawned from workflow could not start because it "
"would result in recursion (template spawn order {})"
).format([spawn_node.unified_job_template.id] + workflow_ancestors)
else:
logger.debug('Starting workflow-in-workflow id={}, wfjt={}, ancestors={}'.format(
job.id, spawn_node.unified_job_template.id, workflow_ancestors))
if not job._resources_sufficient_for_launch():
can_start = False
job.job_explanation = _("Job spawned from workflow could not start because it "
"was missing a related resource such as project or inventory")
if can_start:
if workflow_job.start_args:
start_args = json.loads(decrypt_field(workflow_job, 'start_args'))
else:
@@ -129,10 +148,6 @@ class TaskManager():
if not can_start:
job.job_explanation = _("Job spawned from workflow could not start because it "
"was not in the right state or required manual credentials")
else:
can_start = False
job.job_explanation = _("Job spawned from workflow could not start because it "
"was missing a related resource such as project or inventory")
if not can_start:
job.status = 'failed'
job.save(update_fields=['status', 'job_explanation'])