From 786e907e3b2a44ff7b13eb4f12e833a80a0a125f Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Thu, 30 Aug 2018 12:54:53 -0400 Subject: [PATCH] put atomic block inside lock block --- awx/main/scheduler/task_manager.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/awx/main/scheduler/task_manager.py b/awx/main/scheduler/task_manager.py index d4b9daf80b..3607e53241 100644 --- a/awx/main/scheduler/task_manager.py +++ b/awx/main/scheduler/task_manager.py @@ -679,9 +679,9 @@ class TaskManager(): return finished_wfjs def schedule(self): - with transaction.atomic(): - # Lock - with advisory_lock('task_manager_lock', wait=False) as acquired: + # Lock + with advisory_lock('task_manager_lock', wait=False) as acquired: + with transaction.atomic(): if acquired is False: logger.debug("Not running scheduler, another task holds lock") return