From c96cf3cf5db7e38e5a01552f9389347f14802f14 Mon Sep 17 00:00:00 2001 From: Wayne Witzel III Date: Wed, 1 Aug 2018 14:52:43 -0400 Subject: [PATCH] unless allow_simultaneous, do not start workflow jobs that are already running --- awx/main/scheduler/task_manager.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/awx/main/scheduler/task_manager.py b/awx/main/scheduler/task_manager.py index 198f0e3652..24ffab5103 100644 --- a/awx/main/scheduler/task_manager.py +++ b/awx/main/scheduler/task_manager.py @@ -482,6 +482,12 @@ class TaskManager(): found_acceptable_queue = False idle_instance_that_fits = None if isinstance(task, WorkflowJob): + running_workflow_templates = [wf.workflow_job_template.pk for wf in self.get_running_workflow_jobs()] + running = task.workflow_job_template.pk in running_workflow_templates + if running: + if not task.allow_simultaneous: + logger.debug(six.text_type("{} is blocked from running, workflow already running").format(task.log_format, task.workflow_job_template.pk)) + continue self.start_task(task, None, task.get_jobs_fail_chain(), None) continue for rampart_group in preferred_instance_groups: