Merge pull request #2161 from gsaudade99/patch/celery

celery - rm watchdog + set one systemd unit with 8 threads

Author: domgz

group_vars/celerycluster.yml

@@ -40,16 +40,20 @@ autofs_mount_points:
 # SystemD
 galaxy_systemd_mode: ""
 galaxy_systemd_celery: true
-galaxy_systemd_celery_internal_max_tasks: 250000
 galaxy_systemd_celery_beat_schedule_path: "/opt/galaxy/celery/celery-beat-schedule"
-galaxy_systemd_watchdog: true
+galaxy_systemd_watchdog: false
 galaxy_systemd_celery_env: "GALAXY_DROPBOX_APP_CLIENT_ID={{ dropbox_app_client_id }} GALAXY_DROPBOX_APP_CLIENT_SECRET={{ dropbox_app_client_secret }} GALAXY_GOOGLE_DRIVE_APP_CLIENT_ID={{ google_drive_oauth_client_id }} GALAXY_GOOGLE_DRIVE_APP_CLIENT_SECRET={{ google_drive_oauth_client_secret }}"
 
-galaxy_systemd_celery_internal_workers: 7
+galaxy_systemd_celery_internal_pool: threads
+galaxy_systemd_celery_internal_max_tasks: 250000
+galaxy_systemd_celery_internal_workers: 1
+galaxy_systemd_celery_internal_concurrency: 8
+galaxy_systemd_memory_limit_celery_internal: "{{ galaxy_systemd_celery_internal_concurrency * 6 }}"
+galaxy_systemd_celery_external_pool: threads
+galaxy_systemd_celery_external_max_tasks: 250000
 galaxy_systemd_celery_external_workers: 1
-galaxy_systemd_memory_limit_celery_internal: 6
-galaxy_systemd_memory_limit_celery_external: 6
-galaxy_systemd_celery_internal_autoscale: "2,2"
+galaxy_systemd_celery_external_concurrency: 2
+galaxy_systemd_memory_limit_celery_external: "{{ galaxy_systemd_celery_external_concurrency * 6 }}"
 
 # Flower
 flower_bind_address: "{{ tailscale_node_ipv4 }}"

host_vars/celery-1.bi.privat.yml

@@ -0,0 +1,2 @@
+galaxy_systemd_celery_internal_concurrency: 14
+galaxy_systemd_celery_external_concurrency: 2