From 68fa92ebccc079df8cef635ef92739ad6f583b19 Mon Sep 17 00:00:00 2001
From: Jason Thomas <jason@lithiumfox.com>
Date: Wed, 11 Apr 2018 11:37:18 -0400
Subject: [PATCH] Updates to docker-entrypoint for worker and scheduler (#364)

* Use --max-tasks-per-child as per celery documentation

* Set --max-memory-per-child to 1/4th of total system memory

* Split exec command over multiple lines

* Fix memory variable typo
---
 bin/docker-entrypoint | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/bin/docker-entrypoint b/bin/docker-entrypoint
index 1bed803efd..a91be66fc8 100755
--- a/bin/docker-entrypoint
+++ b/bin/docker-entrypoint
@@ -5,9 +5,13 @@ worker() {
   /app/manage.py db upgrade
   WORKERS_COUNT=${WORKERS_COUNT:-2}
   QUEUES=${QUEUES:-queries,scheduled_queries,celery}
+  MAX_MEMORY=$(($(/usr/bin/awk '/MemTotal/ {print $2}' /proc/meminfo)/4))
 
   echo "Starting $WORKERS_COUNT workers for queues: $QUEUES..."
-  exec /usr/local/bin/celery worker --app=redash.worker -c$WORKERS_COUNT -Q$QUEUES -linfo --maxtasksperchild=10 -Ofair
+  exec /usr/local/bin/celery worker --app=redash.worker -c$WORKERS_COUNT -Q$QUEUES -linfo \
+      --max-tasks-per-child=10 \
+      --max-memory-per-child=$MAX_MEMORY \
+      -Ofair
 }
 
 scheduler() {
@@ -17,7 +21,9 @@ scheduler() {
 
   echo "Starting scheduler and $WORKERS_COUNT workers for queues: $QUEUES..."
 
-  exec /usr/local/bin/celery worker --app=redash.worker --beat -c$WORKERS_COUNT -Q$QUEUES -linfo --maxtasksperchild=10 -Ofair
+  exec /usr/local/bin/celery worker --app=redash.worker --beat -c$WORKERS_COUNT -Q$QUEUES -linfo \
+      --max-tasks-per-child=10 \
+      -Ofair
 }
 
 server() {