Skip to content

Commit 9eec64c

Browse files
author
afabiani
committed
[Revert] Set celery worker default concurrency to 2
1 parent 5ebd704 commit 9eec64c

8 files changed

+9
-9
lines changed

celery.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/bash
22
nohup celery -A geonode.celery_app:app beat -l DEBUG -f /var/log/celery.log &>/dev/null &
3-
nohup celery -A geonode.celery_app:app worker -B -E --statedb=worker.state -s celerybeat-schedule --loglevel=INFO --concurrency=2 -n worker1@%h -f /var/log/celery.log &>/dev/null &
3+
nohup celery -A geonode.celery_app:app worker -B -E --statedb=worker.state -s celerybeat-schedule --loglevel=INFO --concurrency=10 -n worker1@%h -f /var/log/celery.log &>/dev/null &
44
nohup celery -A geonode.celery_app:app flower --auto_refresh=True --debug=False --broker=${BROKER_URL} --basic_auth=${ADMIN_USERNAME}:${ADMIN_PASSWORD} --address=0.0.0.0 --port=5555 &>/dev/null &

celery_dev.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ set -a
22
. ./.env_dev
33
set +a
44

5-
celery -A geonode.celery_app:app worker -B -E --statedb=worker.state -s celerybeat-schedule --loglevel=DEBUG --concurrency=2 -n worker1@%h
5+
celery -A geonode.celery_app:app worker -B -E --statedb=worker.state -s celerybeat-schedule --loglevel=DEBUG --concurrency=10 -n worker1@%h

docker-compose-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ services:
4343
environment:
4444
- IS_CELERY=True
4545
entrypoint: ["/usr/src/geonode/entrypoint.sh"]
46-
command: "celery -A geonode.celery_app:app worker -B -E --statedb=/mnt/volumes/statics/worker.state -s /mnt/volumes/statics/celerybeat-schedule --loglevel=INFO --concurrency=2 -n worker1@%h -f /var/log/celery.log"
46+
command: "celery -A geonode.celery_app:app worker -B -E --statedb=/mnt/volumes/statics/worker.state -s /mnt/volumes/statics/celerybeat-schedule --loglevel=INFO --concurrency=10 -n worker1@%h -f /var/log/celery.log"
4747

4848
# Nginx is serving django static and media files and proxies to django and geonode
4949
geonode:

docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ services:
4343
environment:
4444
- IS_CELERY=True
4545
entrypoint: ["/usr/src/geonode/entrypoint.sh"]
46-
command: "celery -A geonode.celery_app:app worker -B -E --statedb=/mnt/volumes/statics/worker.state -s /mnt/volumes/statics/celerybeat-schedule --loglevel=INFO --concurrency=2 -n worker1@%h -f /var/log/celery.log"
46+
command: "celery -A geonode.celery_app:app worker -B -E --statedb=/mnt/volumes/statics/worker.state -s /mnt/volumes/statics/celerybeat-schedule --loglevel=INFO --concurrency=10 -n worker1@%h -f /var/log/celery.log"
4747

4848
# Nginx is serving django static and media files and proxies to django and geonode
4949
geonode:

geonode/tasks/tasks.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,10 @@ def send_email(self, *args, **kwargs):
122122
bind=True,
123123
name='geonode.tasks.notifications.send_queued_notifications',
124124
queue='email',
125-
expires=600,
125+
expires=10,
126126
acks_late=False,
127127
autoretry_for=(Exception, ),
128-
retry_kwargs={'max_retries': 3, 'countdown': 10},
128+
retry_kwargs={'max_retries': 2, 'countdown': 10},
129129
retry_backoff=True,
130130
retry_backoff_max=700,
131131
retry_jitter=True)

pavement.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,7 @@ def start_django(options):
614614
if 'django_celery_beat' not in INSTALLED_APPS:
615615
sh("{} celery -A geonode.celery_app:app worker -B -E \
616616
--statedb=worker.state -s celerybeat-schedule --loglevel=DEBUG \
617-
--concurrency=2 -n worker1@%h -f celery.log {}".format( # noqa
617+
--concurrency=10 -n worker1@%h -f celery.log {}".format( # noqa
618618
settings,
619619
foreground
620620
))

scripts/spcgeonode/docker-compose.override.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ services:
1818
command: "uwsgi --chdir=/spcgeonode --module=geonode.wsgi --socket=:8000 --http=127.0.0.1:8001 --processes=5 --py-autoreload=2"
1919
celery:
2020
<< : *default-common-django
21-
command: 'celery -A geonode.celery_app:app worker -B -E --statedb=worker.state -s celerybeat-schedule --loglevel=DEBUG --concurrency=2 -n worker1@%h'
21+
command: 'celery -A geonode.celery_app:app worker -B -E --statedb=worker.state -s celerybeat-schedule --loglevel=DEBUG --concurrency=10 -n worker1@%h'
2222

2323
nginx:
2424
image: geonode/spcgeonode:nginx-3.1

scripts/spcgeonode/docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ services:
7272
celery:
7373
<< : *default-common-django
7474
entrypoint: []
75-
command: 'celery -A geonode.celery_app:app worker -B -E --statedb=worker.state -s celerybeat-schedule --loglevel=INFO --concurrency=2 -n worker1@%h'
75+
command: 'celery -A geonode.celery_app:app worker -B -E --statedb=worker.state -s celerybeat-schedule --loglevel=INFO --concurrency=10 -n worker1@%h'
7676

7777
# Nginx is serving django static and media files and proxies to django and geonode
7878
nginx:

0 commit comments

Comments
 (0)