From 5da31ecb68eb8f2a3c5e261412349dc71e1dfe15 Mon Sep 17 00:00:00 2001 From: "marcel.kocisek" Date: Thu, 23 Oct 2025 18:32:08 +0200 Subject: [PATCH 1/2] Run celery job extractor --- deployment/enterprise/.env.template | 3 +++ deployment/enterprise/docker-compose.maps.yml | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/deployment/enterprise/.env.template b/deployment/enterprise/.env.template index b66eb37c..d6128394 100644 --- a/deployment/enterprise/.env.template +++ b/deployment/enterprise/.env.template @@ -156,6 +156,9 @@ CELERYD_CONCURRENCY=2 #CELERYD_PREFETCH_MULTIPLIER=4 CELERYD_PREFETCH_MULTIPLIER=4 +# routes needed to run qgis-extractor in separate queue +CELERY_ROUTES={ 'qgis-extractor.*':{'queue':'extractor'} } + # various life times diff --git a/deployment/enterprise/docker-compose.maps.yml b/deployment/enterprise/docker-compose.maps.yml index 0ad63661..47d8cdc0 100644 --- a/deployment/enterprise/docker-compose.maps.yml +++ b/deployment/enterprise/docker-compose.maps.yml @@ -38,7 +38,8 @@ services: - OVERVIEWS_DATA_DIR=/data - MM_WMS_TILE_BUFFER=100 - MM_WMS_AVOID_ARTIFACTS=1 - - BROKER_URL=redis://redis:6379/0 - - CELERY_RESULT_BACKEND=redis://redis:6379/0 + - BROKER_URL=redis://merginmaps-redis:6379/0 + - CELERY_RESULT_BACKEND=redis://merginmaps-redis:6379/0 + - 'CELERY_TASK_ROUTES={"src.maps.tasks.finish_overview": {"queue": "celery"}}' volumes: - ./map_data:/data From bc93f926bd452eb0d1e973f0f4c6db3405979a9c Mon Sep 17 00:00:00 2001 From: "marcel.kocisek" Date: Thu, 23 Oct 2025 18:47:08 +0200 Subject: [PATCH 2/2] add qgis extractor celery route to docker-compose to prevent unnecessary migrations --- deployment/enterprise/.env.template | 3 --- deployment/enterprise/docker-compose.yml | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/deployment/enterprise/.env.template b/deployment/enterprise/.env.template index d6128394..b66eb37c 100644 --- a/deployment/enterprise/.env.template +++ b/deployment/enterprise/.env.template @@ -156,9 +156,6 @@ CELERYD_CONCURRENCY=2 #CELERYD_PREFETCH_MULTIPLIER=4 CELERYD_PREFETCH_MULTIPLIER=4 -# routes needed to run qgis-extractor in separate queue -CELERY_ROUTES={ 'qgis-extractor.*':{'queue':'extractor'} } - # various life times diff --git a/deployment/enterprise/docker-compose.yml b/deployment/enterprise/docker-compose.yml index 740e7492..a9f33023 100644 --- a/deployment/enterprise/docker-compose.yml +++ b/deployment/enterprise/docker-compose.yml @@ -76,6 +76,8 @@ services: - ./map_data:/overviews env_file: - .prod.env + environment: + - CELERY_ROUTES={ 'qgis-extractor.*':{'queue':'extractor'} } depends_on: - db - redis