From 6606a29f57fc6a7abdb966342f37e3259696660c Mon Sep 17 00:00:00 2001 From: chris meyers Date: Tue, 27 Feb 2018 12:07:16 -0500 Subject: [PATCH] celery 4.x -> 3.x change route config name --- awx/main/tasks.py | 4 ++-- awx/main/tests/functional/conftest.py | 2 +- awx/main/tests/unit/settings/test_defaults.py | 10 +++++----- awx/main/tests/unit/utils/test_ha.py | 8 ++++---- awx/main/utils/ha.py | 8 ++++---- awx/settings/defaults.py | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/awx/main/tasks.py b/awx/main/tasks.py index b0c1483de3..bddfaaa6f2 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -213,7 +213,7 @@ def handle_ha_toplogy_changes(self): .format(instance.hostname, removed_queues, added_queues)) updated_routes = update_celery_worker_routes(instance, settings) logger.info("Worker on tower node '{}' updated celery routes {} all routes are now {}" - .format(instance.hostname, updated_routes, self.app.conf.CELERY_TASK_ROUTES)) + .format(instance.hostname, updated_routes, self.app.conf.CELERY_ROUTES)) @worker_ready.connect @@ -232,7 +232,7 @@ def handle_update_celery_routes(sender=None, conf=None, **kwargs): instance = Instance.objects.me() added_routes = update_celery_worker_routes(instance, conf) logger.info("Workers on tower node '{}' added routes {} all routes are now {}" - .format(instance.hostname, added_routes, conf.CELERY_TASK_ROUTES)) + .format(instance.hostname, added_routes, conf.CELERY_ROUTES)) @celeryd_after_setup.connect diff --git a/awx/main/tests/functional/conftest.py b/awx/main/tests/functional/conftest.py index b799763094..f3f4aba4b8 100644 --- a/awx/main/tests/functional/conftest.py +++ b/awx/main/tests/functional/conftest.py @@ -72,7 +72,7 @@ def celery_memory_broker(): Allows django signal code to execute without the need for redis ''' - settings.CELERY_BROKER_URL='memory://localhost/' + settings.BROKER_URL='memory://localhost/' @pytest.fixture diff --git a/awx/main/tests/unit/settings/test_defaults.py b/awx/main/tests/unit/settings/test_defaults.py index 3cc0ed46f6..52eeb56425 100644 --- a/awx/main/tests/unit/settings/test_defaults.py +++ b/awx/main/tests/unit/settings/test_defaults.py @@ -8,11 +8,11 @@ from datetime import timedelta ('admin_checks', 'awx.main.tasks.run_administrative_checks'), ('tower_scheduler', 'awx.main.tasks.awx_periodic_scheduler'), ]) -def test_CELERY_BEAT_SCHEDULE(mocker, job_name, function_path): - assert job_name in settings.CELERY_BEAT_SCHEDULE - assert 'schedule' in settings.CELERY_BEAT_SCHEDULE[job_name] - assert type(settings.CELERY_BEAT_SCHEDULE[job_name]['schedule']) is timedelta - assert settings.CELERY_BEAT_SCHEDULE[job_name]['task'] == function_path +def test_CELERYBEAT_SCHEDULE(mocker, job_name, function_path): + assert job_name in settings.CELERYBEAT_SCHEDULE + assert 'schedule' in settings.CELERYBEAT_SCHEDULE[job_name] + assert type(settings.CELERYBEAT_SCHEDULE[job_name]['schedule']) is timedelta + assert settings.CELERYBEAT_SCHEDULE[job_name]['task'] == function_path # Ensures that the function exists mocker.patch(function_path) diff --git a/awx/main/tests/unit/utils/test_ha.py b/awx/main/tests/unit/utils/test_ha.py index 8e3281e1f8..95e7aa260b 100644 --- a/awx/main/tests/unit/utils/test_ha.py +++ b/awx/main/tests/unit/utils/test_ha.py @@ -17,7 +17,7 @@ from awx.main.utils.ha import ( @pytest.fixture def conf(): class Conf(): - CELERY_TASK_ROUTES = dict() + CELERY_ROUTES = dict() CELERYBEAT_SCHEDULE = dict() return Conf() @@ -88,14 +88,14 @@ class TestUpdateCeleryWorkerRoutes(): instance.is_controller = mocker.MagicMock(return_value=is_controller) assert update_celery_worker_routes(instance, conf) == expected_routes - assert conf.CELERY_TASK_ROUTES == expected_routes + assert conf.CELERY_ROUTES == expected_routes def test_update_celery_worker_routes_deleted(self, mocker, conf): instance = mocker.MagicMock() instance.hostname = 'east-1' instance.is_controller = mocker.MagicMock(return_value=False) - conf.CELERY_TASK_ROUTES = {'awx.main.tasks.awx_isolated_heartbeat': 'foobar'} + conf.CELERY_ROUTES = {'awx.main.tasks.awx_isolated_heartbeat': 'foobar'} update_celery_worker_routes(instance, conf) - assert 'awx.main.tasks.awx_isolated_heartbeat' not in conf.CELERY_TASK_ROUTES + assert 'awx.main.tasks.awx_isolated_heartbeat' not in conf.CELERY_ROUTES diff --git a/awx/main/utils/ha.py b/awx/main/utils/ha.py index 6acf3d7067..c9d70ad2c3 100644 --- a/awx/main/utils/ha.py +++ b/awx/main/utils/ha.py @@ -48,12 +48,12 @@ def update_celery_worker_routes(instance, conf): if instance.is_controller(): tasks.append('awx.main.tasks.awx_isolated_heartbeat') else: - if 'awx.main.tasks.awx_isolated_heartbeat' in conf.CELERY_TASK_ROUTES: - del conf.CELERY_TASK_ROUTES['awx.main.tasks.awx_isolated_heartbeat'] + if 'awx.main.tasks.awx_isolated_heartbeat' in conf.CELERY_ROUTES: + del conf.CELERY_ROUTES['awx.main.tasks.awx_isolated_heartbeat'] for t in tasks: - conf.CELERY_TASK_ROUTES[t] = {'queue': instance.hostname, 'routing_key': instance.hostname} - routes_updated[t] = conf.CELERY_TASK_ROUTES[t] + conf.CELERY_ROUTES[t] = {'queue': instance.hostname, 'routing_key': instance.hostname} + routes_updated[t] = conf.CELERY_ROUTES[t] return routes_updated diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index 8268849c61..0806978c77 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -453,7 +453,7 @@ CELERY_QUEUES = ( Queue('tower', Exchange('tower'), routing_key='tower'), Broadcast('tower_broadcast_all') ) -CELERY_TASK_ROUTES = {} +CELERY_ROUTES = {} CELERYBEAT_SCHEDULER = 'celery.beat.PersistentScheduler' CELERYBEAT_MAX_LOOP_INTERVAL = 60