From 2d07aaf88f23e36ff1bf7a0251a57bde18feaa2e Mon Sep 17 00:00:00 2001 From: Maja Massarini Date: Fri, 8 Mar 2024 09:35:08 +0100 Subject: [PATCH] Declare babysit tasks celery queue in a different way send_task should have the same options as apply_async, nevertheless passing queue as an option is not working. Probably because the referenced queues have to be defined in task_queues. Instead of defining task_queues let define explicitly the routes. --- packit_service/celery_config.py | 6 ++++++ packit_service/worker/handlers/vm_image.py | 1 - packit_service/worker/helpers/build/copr_build.py | 1 - 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packit_service/celery_config.py b/packit_service/celery_config.py index 56d91a987..513347892 100644 --- a/packit_service/celery_config.py +++ b/packit_service/celery_config.py @@ -7,6 +7,12 @@ # https://docs.celeryq.dev/en/stable/userguide/configuration.html#std-setting-task_default_queue task_default_queue = packit_service.constants.CELERY_TASK_DEFAULT_QUEUE + +task_routes = [ + ("task.babysit_vm_image_build", {"queue": "short-running"}), + ("task.babysit_copr_build", {"queue": "short-running"}), +] + # https://docs.celeryq.dev/en/stable/userguide/periodic-tasks.html beat_schedule = { "update-pending-copr-builds": { diff --git a/packit_service/worker/handlers/vm_image.py b/packit_service/worker/handlers/vm_image.py index 059aa70aa..5af76b4b0 100644 --- a/packit_service/worker/handlers/vm_image.py +++ b/packit_service/worker/handlers/vm_image.py @@ -105,7 +105,6 @@ def run(self) -> TaskResults: "task.babysit_vm_image_build", args=(image_id,), countdown=10, # do the first check in 10s - queue="long-running", ) self.report_status(VMImageBuildStatus.pending, "") diff --git a/packit_service/worker/helpers/build/copr_build.py b/packit_service/worker/helpers/build/copr_build.py index 80ae9a358..1723a86bc 100644 --- a/packit_service/worker/helpers/build/copr_build.py +++ b/packit_service/worker/helpers/build/copr_build.py @@ -766,7 +766,6 @@ def handle_rpm_build_start( "task.babysit_copr_build", args=(build_id,), countdown=120, # do the first check in 120s - queue="long-running", ) def _visualize_chroots_diff(