Skip to content

Commit 2a757e6

Browse files
dependabot[bot]duanhongyi
authored andcommitted
chore(deps): bump django from 4.2.3 to 4.2.7 in /rootfs
Bumps [django](https://github.com/django/django) from 4.2.3 to 4.2.7. - [Commits](django/django@4.2.3...4.2.7) --- updated-dependencies: - dependency-name: django dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
1 parent 1b58574 commit 2a757e6

3 files changed

Lines changed: 38 additions & 19 deletions

File tree

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,12 @@ spec:
3939
- $(DRYCC_REDIS_ADDRS),$(DRYCC_CONTROLLER_API_SERVICE_HOST):$(DRYCC_CONTROLLER_API_SERVICE_PORT)
4040
{{- include "controller.envs" . | indent 8 }}
4141
containers:
42-
{{- range $key := (list "low" "middle" "high") }}
43-
- name: drycc-controller-celery-{{$key}}
42+
- name: drycc-controller-celery
4443
image: {{$.Values.imageRegistry}}/{{$.Values.imageOrg}}/controller:{{$.Values.imageTag}}
4544
imagePullPolicy: {{$.Values.imagePullPolicy}}
4645
args:
4746
- /bin/bash
4847
- -c
49-
- celery -A api worker -Q controller.priority.{{$key}} --autoscale=32,1 --loglevel=WARNING
48+
- celery -A api worker --autoscale=32,1 --loglevel=WARNING
5049
{{- include "controller.limits" $ | indent 8 }}
5150
{{- include "controller.envs" $ | indent 8 }}
52-
{{- end }}

rootfs/api/settings/celery.py

Lines changed: 35 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import os
2-
from celery import Celery, platforms
2+
from kombu import Exchange, Queue
3+
from celery import Celery
34

45

5-
class Config:
6+
class Config(object):
67
# Celery Configuration Options
78
timezone = "Asia/Shanghai"
89
enable_utc = True
@@ -19,37 +20,57 @@ class Config:
1920
result_expires = 24 * 60 * 60
2021
broker_url = os.environ.get('DRYCC_RABBITMQ_URL', 'amqp://guest:guest@127.0.0.1:5672/') # noqa
2122
cache_backend = 'django-cache'
22-
task_default_queue = 'controller'
23-
task_default_exchange = 'priority'
23+
task_default_queue = 'low'
24+
task_default_exchange = 'controller.priority'
2425
task_default_routing_key = 'controller.priority.low'
26+
broker_connection_retry_on_startup = True
2527
worker_cancel_long_running_tasks_on_connection_loss = True
2628

2729

2830
app = Celery('drycc')
29-
app.config_from_object(Config)
31+
app.config_from_object(Config())
3032
app.conf.update(
3133
task_routes={
3234
'api.tasks.scale_app': {
33-
'queue': 'priority',
34-
'exchange': 'controller',
35+
'queue': 'high',
36+
'exchange': 'controller.priority',
3537
'routing_key': 'controller.priority.high',
3638
},
3739
'api.tasks.restart_app': {
38-
'queue': 'priority',
39-
'exchange': 'controller',
40+
'queue': 'high',
41+
'exchange': 'controller.priority',
4042
'routing_key': 'controller.priority.high',
4143
},
4244
'api.tasks.retrieve_resource': {
43-
'queue': 'priority',
44-
'exchange': 'controller',
45+
'queue': 'high',
46+
'exchange': 'controller.priority',
4547
'routing_key': 'controller.priority.high',
4648
},
4749
'api.tasks.send_measurements': {
48-
'queue': 'priority',
49-
'exchange': 'controller',
50+
'queue': 'middle',
51+
'exchange': 'controller.priority',
5052
'routing_key': 'controller.priority.middle',
5153
},
5254
},
55+
task_queues=(
56+
Queue(
57+
'low',
58+
exchange=Exchange('controller.priority', type="direct"),
59+
routing_key='controller.priority.low',
60+
queue_arguments={'x-max-priority': 16},
61+
),
62+
Queue(
63+
'high',
64+
exchange=Exchange('controller.priority', type="direct"),
65+
routing_key='controller.priority.high',
66+
queue_arguments={'x-max-priority': 64},
67+
),
68+
Queue(
69+
'middle',
70+
exchange=Exchange('controller.priority', type="direct"),
71+
routing_key='controller.priority.middle',
72+
queue_arguments={'x-max-priority': 32},
73+
),
74+
),
5375
)
5476
app.autodiscover_tasks()
55-
platforms.C_FORCE_ROOT = True

rootfs/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Drycc controller requirements
22
backoff==2.2.1
3-
django==4.2.3
3+
django==4.2.7
44
channels==4.0.0
55
aiohttp==3.8.5
66
django-cors-headers==4.1.0

0 commit comments

Comments
 (0)