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

Change place where controller node is being looked for in the task manager

Browse Source
This commit is contained in:
beeankha
2021-08-16 11:58:57 -04:00
committed by Alan Rominger
parent 3b1e40d227
commit 1a9fcdccc2
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -255,12 +255,6 @@ class TaskManager:
} }
dependencies = [{'type': get_type_for_model(type(t)), 'id': t.id} for t in dependent_tasks] dependencies = [{'type': get_type_for_model(type(t)), 'id': t.id} for t in dependent_tasks]
try:
controller_node = Instance.choose_online_control_plane_node()
except IndexError:
logger.warning("No control plane nodes available to manage {}".format(task.log_format))
return
task.status = 'waiting' task.status = 'waiting'
(start_status, opts) = task.pre_start() (start_status, opts) = task.pre_start()
@@ -298,8 +292,13 @@ class TaskManager:
else: else:
task.instance_group = rampart_group task.instance_group = rampart_group
task.execution_node = instance.hostname task.execution_node = instance.hostname
try:
controller_node = Instance.choose_online_control_plane_node()
except IndexError:
logger.warning("No control plane nodes available to manage {}".format(task.log_format))
return
task.controller_node = controller_node task.controller_node = controller_node
logger.debug('Submitting job {} to queue {} controlled by {}.'.format(task.log_format, task.execution_node, controller_node)) logger.debug('Submitting job {} to queue {} controlled by {}.'.format(task.log_format, task.execution_node, task.controller_node))
with disable_activity_stream(): with disable_activity_stream():
task.celery_task_id = str(uuid.uuid4()) task.celery_task_id = str(uuid.uuid4())
task.save() task.save()