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

remove isolated instance group queue listening

Browse Source
This commit is contained in:
chris meyers
2018-06-08 13:46:58 -04:00
parent 1cea20092c
commit fb11967114
3 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
awx/main/tasks.py
View File

@@ -209,19 +209,19 @@ def handle_ha_toplogy_changes(self):
logger.debug(six.text_type("Reconfigure celeryd queues task on host {}").format(self.request.hostname)) logger.debug(six.text_type("Reconfigure celeryd queues task on host {}").format(self.request.hostname))
awx_app = Celery('awx') awx_app = Celery('awx')
awx_app.config_from_object('django.conf:settings') awx_app.config_from_object('django.conf:settings')
instances, removed_queues, added_queues = register_celery_worker_queues(awx_app, self.request.hostname) removed_queues, added_queues = register_celery_worker_queues(awx_app, self.request.hostname)
if len(removed_queues) + len(added_queues) > 0: if len(removed_queues) + len(added_queues) > 0:
logger.info(six.text_type("Workers on tower node(s) '{}' removed from queues {} and added to queues {}") logger.info(six.text_type("Workers on tower node '{}' removed from queues {} and added to queues {}")
.format([i.hostname for i in instances], removed_queues, added_queues)) .format(self.request.hostname, removed_queues, added_queues))
@worker_ready.connect @worker_ready.connect
def handle_ha_toplogy_worker_ready(sender, **kwargs): def handle_ha_toplogy_worker_ready(sender, **kwargs):
logger.debug(six.text_type("Configure celeryd queues task on host {}").format(sender.hostname)) logger.debug(six.text_type("Configure celeryd queues task on host {}").format(sender.hostname))
instances, removed_queues, added_queues = register_celery_worker_queues(sender.app, sender.hostname) removed_queues, added_queues = register_celery_worker_queues(sender.app, sender.hostname)
if len(removed_queues) + len(added_queues) > 0: if len(removed_queues) + len(added_queues) > 0:
logger.info(six.text_type("Workers on tower node(s) '{}' removed from queues {} and added to queues {}") logger.info(six.text_type("Workers on tower node '{}' removed from queues {} and added to queues {}")
.format([i.hostname for i in instances], removed_queues, added_queues)) .format(sender.hostname, removed_queues, added_queues))
# Expedite the first hearbeat run so a node comes online quickly. # Expedite the first hearbeat run so a node comes online quickly.
cluster_node_heartbeat.apply([]) cluster_node_heartbeat.apply([])

2
awx/main/tests/unit/utils/test_ha.py
View File

@@ -61,7 +61,7 @@ class TestAddRemoveCeleryWorkerQueues():
mock.patch('awx.main.utils.ha.settings.AWX_CELERY_QUEUES_STATIC', static_queues), mock.patch('awx.main.utils.ha.settings.AWX_CELERY_QUEUES_STATIC', static_queues),
mock.patch('awx.main.utils.ha.settings.AWX_CELERY_BCAST_QUEUES_STATIC', broadcast_queues), mock.patch('awx.main.utils.ha.settings.AWX_CELERY_BCAST_QUEUES_STATIC', broadcast_queues),
mock.patch('awx.main.utils.ha.settings.CLUSTER_HOST_ID', hostname)): mock.patch('awx.main.utils.ha.settings.CLUSTER_HOST_ID', hostname)):
(added_queues, removed_queues) = _add_remove_celery_worker_queues(mock_app, [instance], worker_queues, hostname) (added_queues, removed_queues) = _add_remove_celery_worker_queues(mock_app, instance, worker_queues, hostname)
assert set(added_expected) == set(added_queues) assert set(added_expected) == set(added_queues)
assert set(removed_expected) == set(removed_queues) assert set(removed_expected) == set(removed_queues)

14
awx/main/utils/ha.py
View File

@@ -14,14 +14,13 @@ def construct_bcast_queue_name(common_name):
return common_name.encode('utf8') + '_' + settings.CLUSTER_HOST_ID return common_name.encode('utf8') + '_' + settings.CLUSTER_HOST_ID
def _add_remove_celery_worker_queues(app, controlled_instances, worker_queues, worker_name): def _add_remove_celery_worker_queues(app, instance, worker_queues, worker_name):
removed_queues = [] removed_queues = []
added_queues = [] added_queues = []
hostnames = set([instance.hostname for instance in controlled_instances])
worker_queue_names = set([q['name'] for q in worker_queues]) worker_queue_names = set([q['name'] for q in worker_queues])
bcast_queue_names = set([construct_bcast_queue_name(n) for n in settings.AWX_CELERY_BCAST_QUEUES_STATIC]) bcast_queue_names = set([construct_bcast_queue_name(n) for n in settings.AWX_CELERY_BCAST_QUEUES_STATIC])
all_queue_names = hostnames | set(settings.AWX_CELERY_QUEUES_STATIC) all_queue_names = set([instance.hostname]) | set(settings.AWX_CELERY_QUEUES_STATIC)
desired_queues = bcast_queue_names | (all_queue_names if instance.enabled else set()) desired_queues = bcast_queue_names | (all_queue_names if instance.enabled else set())
# Remove queues # Remove queues
@@ -69,18 +68,13 @@ class AWXCeleryRouter(object):
def register_celery_worker_queues(app, celery_worker_name): def register_celery_worker_queues(app, celery_worker_name):
instance = Instance.objects.me() instance = Instance.objects.me()
controlled_instances = [instance]
if instance.is_controller():
controlled_instances.extend(Instance.objects.filter(
rampart_groups__controller__instances__hostname=instance.hostname
))
added_queues = [] added_queues = []
removed_queues = [] removed_queues = []
celery_host_queues = app.control.inspect([celery_worker_name]).active_queues() celery_host_queues = app.control.inspect([celery_worker_name]).active_queues()
celery_worker_queues = celery_host_queues[celery_worker_name] if celery_host_queues else [] celery_worker_queues = celery_host_queues[celery_worker_name] if celery_host_queues else []
(added_queues, removed_queues) = _add_remove_celery_worker_queues(app, controlled_instances, (added_queues, removed_queues) = _add_remove_celery_worker_queues(app, instance,
celery_worker_queues, celery_worker_name) celery_worker_queues, celery_worker_name)
return (controlled_instances, removed_queues, added_queues) return (removed_queues, added_queues)