From fc6a53eda957ec0d693b23041dc897b3298ac956 Mon Sep 17 00:00:00 2001 From: Erik Ritter Date: Mon, 1 Jul 2019 10:02:37 -0700 Subject: [PATCH] [SQL Lab] Add hard time limit fallback for async queries (#7783) --- superset/sql_lab.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/superset/sql_lab.py b/superset/sql_lab.py index c0b778a6e2..8d8aa1625d 100644 --- a/superset/sql_lab.py +++ b/superset/sql_lab.py @@ -40,6 +40,7 @@ from superset.utils.decorators import stats_timing config = app.config stats_logger = config.get("STATS_LOGGER") SQLLAB_TIMEOUT = config.get("SQLLAB_ASYNC_TIME_LIMIT_SEC", 600) +SQLLAB_HARD_TIMEOUT = SQLLAB_TIMEOUT + 60 log_query = config.get("QUERY_LOGGER") @@ -114,7 +115,10 @@ def session_scope(nullpool): @celery_app.task( - name="sql_lab.get_sql_results", bind=True, soft_time_limit=SQLLAB_TIMEOUT + name="sql_lab.get_sql_results", + bind=True, + time_limit=SQLLAB_HARD_TIMEOUT, + soft_time_limit=SQLLAB_TIMEOUT, ) def get_sql_results( ctask,