fix(*): Downgrade to Celery 4.4.6

Celery v4.4.7 introduced a regression in setting of configuration options which still seems to exist in v5.0.0. See celery/celery#6285 and others.
stencila · Oct 13, 2020 · c75c2bb · c75c2bb
1 parent ed102ce
commit c75c2bb
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 20 deletions.
diff --git a/manager/requirements.txt b/manager/requirements.txt
@@ -1,6 +1,6 @@
-amqp==5.0.1
+amqp==2.6.1
 brotli==1.0.9
-celery==5.0.0
+celery==4.4.6
 customidenticon==0.1.5
 dj_database_url==0.5.0
 dj-stripe==2.3.0

diff --git a/overseer/requirements.txt b/overseer/requirements.txt
@@ -1,4 +1,4 @@
-amqp==5.0.1
-celery==5.0.0
+amqp==2.6.1
+celery==4.4.6
 httpx==0.16.1
 prometheus_client==0.8.0
diff --git a/scheduler/requirements.txt b/scheduler/requirements.txt
@@ -1,5 +1,5 @@
-amqp==5.0.1
-celery==5.0.0
+amqp==2.6.1
+celery==4.4.6
 django-celery-beat==2.0.0
 dj-database-url==0.5.0
 psycopg2-binary==2.8.6
diff --git a/worker/Dockerfile b/worker/Dockerfile
@@ -64,8 +64,4 @@ USER worker
 
 # Use the array form of CMD to ensure that the celery process has PID 1
 # so that it will receive SIGTERM for graceful shutdown
-CMD ["celery", "--app=worker", "worker", \
-       "--events", \
-       "--heartbeat-interval=60", \
-       "--prefetch-multiplier=1", \
-       "--concurrency=10" ]
+CMD ["celery", "--app=worker", "worker", "--heartbeat-interval=60"]
diff --git a/worker/Makefile b/worker/Makefile
@@ -42,15 +42,11 @@ run: venv
 	BROKER_URL=amqp://stencila:password@localhost:5672/stencila \
 	CACHE_URL=redis://stencila:password@localhost:6379/0 \
 	WORKER_CONCURRENCY=3 \
-	$(VE)/celery \
-		--app worker \
-		worker \
-		--events \
+	$(VE)/celery --app=worker worker \
 		--loglevel DEBUG \
 		--hostname worker-$$(date +'%s')@%h \
 		--heartbeat-interval 60
 
-
 # Build Docker image
 build:
 	docker build --tag stencila/hub-worker .

diff --git a/worker/requirements.txt b/worker/requirements.txt
@@ -1,5 +1,5 @@
-amqp==5.0.1
-celery==5.0.0
+amqp==2.6.1
+celery==4.4.6
 google-api-python-client==1.12.3
 kubernetes==11.0.0
 lxml==4.5.2

diff --git a/worker/worker.py b/worker/worker.py
@@ -29,8 +29,6 @@
     "worker", broker=os.environ["BROKER_URL"], backend=os.environ["CACHE_URL"],
 )
 app.conf.update(
-    # In Celery 5.0 it appear necessary to also set (some of?) these options
-    # in the command line invocation
     # List of queues to subscribe to
     task_queues=[
         Queue(queue, exchange=queue, routing_key=queue)