External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-22 08:17:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Shift task start signal into an asynchronous task so we don't deadlock trying to update the same record from the task runner while waiting for the signal to be received from the signaler

Browse Source
This commit is contained in:
Matthew Jones
2014-03-22 11:18:25 -04:00
parent 4b9059388e
commit bec301c2a8
5 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/main/models/jobs.py
View File

@@ -385,6 +385,7 @@ class Job(CommonTask):
return dependencies
def signal_start(self, **kwargs):
from awx.main.tasks import notify_task_runner
if hasattr(settings, 'CELERY_UNIT_TEST'):
return self.start(None, **kwargs)
if not self.can_start:
@@ -399,11 +400,7 @@ class Job(CommonTask):
self.save()
self.start_args = encrypt_field(self, 'start_args')
self.save()
signal_context = zmq.Context()
signal_socket = signal_context.socket(zmq.REQ)
signal_socket.connect(settings.TASK_COMMAND_PORT)
signal_socket.send_json(dict(task_type="ansible_playbook", id=self.id))
signal_socket.recv()
notify_task_runner.delay(dict(task_type="ansible_playbook", id=self.id))
return True
def start(self, error_callback, **kwargs):