From 0fb7256df1729515ebaab45b9422f7e9a07a83ba Mon Sep 17 00:00:00 2001 From: Graham Herceg Date: Thu, 22 Aug 2024 16:22:48 -0400 Subject: [PATCH 1/3] Add repeat_record_datasource_queue to staging --- environments/staging/app-processes.yml | 2 +- environments/staging/public.yml | 1 + .../ansible/roles/commcarehq/templates/localsettings.py.j2 | 4 ++++ src/commcare_cloud/environment/schemas/app_processes.py | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/environments/staging/app-processes.yml b/environments/staging/app-processes.yml index f9cc3fd4e5..9df8b0be98 100644 --- a/environments/staging/app-processes.yml +++ b/environments/staging/app-processes.yml @@ -43,7 +43,7 @@ celery_processes: reminder_case_update_queue,reminder_queue: pooling: gevent concurrency: 2 - repeat_record_queue: + repeat_record_queue, repeat_record_datasource_queue: pooling: gevent concurrency: 2 reminder_case_update_bulk_queue,reminder_rule_queue: diff --git a/environments/staging/public.yml b/environments/staging/public.yml index e6d161d7a2..ba59cf47a7 100644 --- a/environments/staging/public.yml +++ b/environments/staging/public.yml @@ -127,6 +127,7 @@ localsettings: BANK_NAME: "RBS Citizens N.A." BANK_SWIFT_CODE: 'CTZIUS33' CELERY_PERIODIC_QUEUE: 'celery_null' + CELERY_REPEAT_RECORD_DATASOURCE_QUEUE: "repeat_record_datasource_queue" COMMCARE_ANALYTICS_HOST: "https://commcare-analytics-staging.dimagi.com" COUCH_CACHE_DOCS: True COUCH_CACHE_VIEWS: True diff --git a/src/commcare_cloud/ansible/roles/commcarehq/templates/localsettings.py.j2 b/src/commcare_cloud/ansible/roles/commcarehq/templates/localsettings.py.j2 index 3810ce83d6..5bfb90935d 100644 --- a/src/commcare_cloud/ansible/roles/commcarehq/templates/localsettings.py.j2 +++ b/src/commcare_cloud/ansible/roles/commcarehq/templates/localsettings.py.j2 @@ -410,6 +410,10 @@ CELERY_HEARTBEAT_THRESHOLDS = { CELERY_REMINDER_CASE_UPDATE_BULK_QUEUE = '{{ localsettings.CELERY_REMINDER_CASE_UPDATE_BULK_QUEUE }}' {% endif %} +{% if 'CELERY_REPEAT_RECORD_DATASOURCE_QUEUE' in localsettings and localsettings.CELERY_REPEAT_RECORD_DATASOURCE_QUEUE %} +CELERY_REPEAT_RECORD_DATASOURCE_QUEUE = '{{ localsettings.CELERY_REPEAT_RECORD_DATASOURCE_QUEUE }}' +{% endif %} + FORMPLAYER_URL = "/formplayer" {% if FORMPLAYER_INTERNAL_AUTH_KEY %} diff --git a/src/commcare_cloud/environment/schemas/app_processes.py b/src/commcare_cloud/environment/schemas/app_processes.py index cbb724f987..85497936fb 100644 --- a/src/commcare_cloud/environment/schemas/app_processes.py +++ b/src/commcare_cloud/environment/schemas/app_processes.py @@ -114,6 +114,7 @@ def __new__(cls, name, required=True, is_queue=True, blockage_threshold=None, CeleryProcess("celery", blockage_threshold=60), CeleryProcess("celery_periodic", required=False, blockage_threshold=10 * 60), CeleryProcess("dashboard_comparison_queue", required=False), + CeleryProcess("repeat_record_datasource_queue", required=False), CeleryProcess("email_queue", blockage_threshold=30), CeleryProcess("export_download_queue", blockage_threshold=30), CeleryProcess("flower", is_queue=False), From d28645e5fa5ce90b09be0d04479101689e57ba1b Mon Sep 17 00:00:00 2001 From: Graham Herceg Date: Thu, 22 Aug 2024 16:43:31 -0400 Subject: [PATCH 2/3] Remove space --- environments/staging/app-processes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/staging/app-processes.yml b/environments/staging/app-processes.yml index 9df8b0be98..1a73684b7f 100644 --- a/environments/staging/app-processes.yml +++ b/environments/staging/app-processes.yml @@ -43,7 +43,7 @@ celery_processes: reminder_case_update_queue,reminder_queue: pooling: gevent concurrency: 2 - repeat_record_queue, repeat_record_datasource_queue: + repeat_record_queue,repeat_record_datasource_queue: pooling: gevent concurrency: 2 reminder_case_update_bulk_queue,reminder_rule_queue: From 83ece43956db33314bd121b0610f8b28b55c86e9 Mon Sep 17 00:00:00 2001 From: Graham Herceg Date: Thu, 22 Aug 2024 16:47:33 -0400 Subject: [PATCH 3/3] Fix pesky linting error --- src/commcare_cloud/environment/schemas/app_processes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/commcare_cloud/environment/schemas/app_processes.py b/src/commcare_cloud/environment/schemas/app_processes.py index 85497936fb..9ec969941e 100644 --- a/src/commcare_cloud/environment/schemas/app_processes.py +++ b/src/commcare_cloud/environment/schemas/app_processes.py @@ -132,7 +132,7 @@ def __new__(cls, name, required=True, is_queue=True, blockage_threshold=None, CeleryProcess("saved_exports_queue", blockage_threshold=6 * 60 * 60), CeleryProcess("sumologic_logs_queue", required=False, blockage_threshold=6 * 60 * 60), CeleryProcess("send_report_throttled", required=False, blockage_threshold=6 * 60 * 60), - CeleryProcess("sms_queue", required=False, blockage_threshold=5 * 60), # TODO remove required + CeleryProcess("sms_queue", required=False, blockage_threshold=5 * 60), # TODO remove required CeleryProcess("submission_reprocessing_queue", required=False, blockage_threshold=60 * 60), CeleryProcess("ucr_indicator_queue", required=False, blockage_threshold=60 * 60), CeleryProcess("ucr_queue", required=False, blockage_threshold=60 * 60),