From 08b7e891a7dd65616aef4177b72b1e8770310d98 Mon Sep 17 00:00:00 2001
From: Alex Guziel <saguziel@gmail.com>
Date: Wed, 9 Aug 2017 22:34:39 -0700
Subject: [PATCH] Use sane Celery defaults to prevent tasks from being delayed
 (#3267)

---
 superset/cli.py    | 2 +-
 superset/config.py | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/superset/cli.py b/superset/cli.py
index f6163bb140b09..e4165e6716be7 100755
--- a/superset/cli.py
+++ b/superset/cli.py
@@ -194,7 +194,7 @@ def worker(workers):
         celery_app.conf.update(
             CELERYD_CONCURRENCY=config.get("SUPERSET_CELERY_WORKERS"))
 
-    worker = celery_worker.worker(app=celery_app)
+    worker = celery_app.Worker(optimization='fair')
     worker.run()
 
 
diff --git a/superset/config.py b/superset/config.py
index bc91edd07b097..94d8dfc56a673 100644
--- a/superset/config.py
+++ b/superset/config.py
@@ -245,6 +245,8 @@ class CeleryConfig(object):
   CELERY_RESULT_BACKEND = 'db+sqlite:///celery_results.sqlite'
   CELERY_ANNOTATIONS = {'tasks.add': {'rate_limit': '10/s'}}
   CELERYD_LOG_LEVEL = 'DEBUG'
+  CELERYD_PREFETCH_MULTIPLIER = 1
+  CELERY_ACKS_LATE = True
 CELERY_CONFIG = CeleryConfig
 """
 CELERY_CONFIG = None