chore(controller): change celery priority

Author: duanhongyi

charts/controller/templates/controller-celery-deloyment.yaml

@@ -39,22 +39,14 @@ spec:
           - $(DRYCC_REDIS_ADDRS),$(DRYCC_CONTROLLER_API_SERVICE_HOST):$(DRYCC_CONTROLLER_API_SERVICE_PORT)
         {{- include "controller.envs" . | indent 8 }}
       containers:
-      - name: drycc-controller-celery-high
-        image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/controller:{{.Values.imageTag}}
-        imagePullPolicy: {{.Values.imagePullPolicy}}
+      {{- range $key := (list "low" "middle" "high") }}
+      - name: drycc-controller-celery-{{$key}}
+        image: {{$.Values.imageRegistry}}/{{$.Values.imageOrg}}/controller:{{$.Values.imageTag}}
+        imagePullPolicy: {{$.Values.imagePullPolicy}}
         args:
           - /bin/bash
           - -c
-          - celery -A api worker -Q priority.high --autoscale=32,1 --loglevel=WARNING
-        {{- include "controller.limits" . | indent 8 }}
-        {{- include "controller.envs" . | indent 8 }}
-      - name: drycc-controller-celery-low
-        image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/controller:{{.Values.imageTag}}
-        imagePullPolicy: {{.Values.imagePullPolicy}}
-        args:
-          - /bin/bash
-          - -c
-          - celery -A api worker -Q priority.low --autoscale=32,1 --loglevel=WARNING
-        {{- include "controller.limits" . | indent 8 }}
-        {{- include "controller.envs" . | indent 8 }}
-
+          - celery -A api worker -Q controller.priority.{{$key}} --autoscale=32,1 --loglevel=WARNING
+        {{- include "controller.limits" $ | indent 8 }}
+        {{- include "controller.envs" $ | indent 8 }}
+      {{- end }}

rootfs/api/settings/celery.py

@@ -19,17 +19,18 @@ class Config:
     result_expires = 24 * 60 * 60
     broker_url = os.environ.get('DRYCC_RABBITMQ_URL', 'amqp://guest:guest@127.0.0.1:5672/')  # noqa
     cache_backend = 'django-cache'
-    task_default_queue = 'priority.low'
+    task_default_queue = 'controller.priority.low'
     worker_cancel_long_running_tasks_on_connection_loss = True
 
 
 app = Celery('drycc')
 app.config_from_object(Config)
 app.conf.update(
     task_routes={
-        'api.tasks.scale_app': {'queue': 'priority.high'},
-        'api.tasks.restart_app': {'queue': 'priority.high'},
-        'api.tasks.retrieve_resource': {'queue': 'priority.high'},
+        'api.tasks.scale_app': {'queue': 'controller.priority.high'},
+        'api.tasks.restart_app': {'queue': 'controller.priority.high'},
+        'api.tasks.retrieve_resource': {'queue': 'controller.priority.high'},
+        'api.tasks.send_measurements': {'queue': 'controller.priority.middle'},
     },
 )
 app.autodiscover_tasks()

rootfs/api/signals.py

@@ -146,7 +146,6 @@ def app_changed_handle(sender, instance: App, created=False, update_fields=None,
         timestamp = time.time()
         send_measurements.apply_async(
             args=[instance.to_measurements(timestamp), ],
-            queue="priority.middle",
         )
 
 
@@ -225,7 +224,6 @@ def config_changed_handle(sender, instance: Config, created=False, update_fields
         timestamp = time.time()
         send_measurements.apply_async(
             args=[instance.app.to_measurements(timestamp), ],
-            queue="priority.middle",
         )
 
 
@@ -236,7 +234,6 @@ def volume_changed_handle(sender, instance: Volume, created=False, update_fields
         timestamp = time.time()
         send_measurements.apply_async(
             args=[instance.to_measurements(timestamp), ],
-            queue="priority.middle",
         )
 
 
@@ -259,5 +256,4 @@ def resource_changed_handle(
         timestamp = time.time()
         send_measurements.apply_async(
             args=[instance.to_measurements(timestamp), ],
-            queue="priority.middle",
         )