From 5c23c63e6dc50d94c8d98d0689ccf4206dc9c2ac Mon Sep 17 00:00:00 2001 From: Yunfan Zhang Date: Wed, 15 Aug 2018 11:32:08 -0400 Subject: [PATCH] Prevent implicit project updates from blocking jobs. Signed-off-by: Yunfan Zhang --- awx/main/scheduler/task_manager.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/awx/main/scheduler/task_manager.py b/awx/main/scheduler/task_manager.py index 96d1e80812..d4b9daf80b 100644 --- a/awx/main/scheduler/task_manager.py +++ b/awx/main/scheduler/task_manager.py @@ -76,7 +76,8 @@ class TaskManager(): inventory_updates_qs = InventoryUpdate.objects.filter( status__in=status_list).exclude(source='file').prefetch_related('inventory_source', 'instance_group') inventory_updates = [i for i in inventory_updates_qs] - project_updates = [p for p in ProjectUpdate.objects.filter(status__in=status_list).prefetch_related('instance_group')] + # Notice the job_type='check': we want to prevent implicit project updates from blocking our jobs. + project_updates = [p for p in ProjectUpdate.objects.filter(status__in=status_list, job_type='check').prefetch_related('instance_group')] system_jobs = [s for s in SystemJob.objects.filter(status__in=status_list).prefetch_related('instance_group')] ad_hoc_commands = [a for a in AdHocCommand.objects.filter(status__in=status_list).prefetch_related('instance_group')] workflow_jobs = [w for w in WorkflowJob.objects.filter(status__in=status_list)]