Skip to content

Commit 76eeea1

Browse files
Make schema refresh timeout configurable via env var (#7114)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent 2ab07f9 commit 76eeea1

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

redash/settings/__init__.py

+1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
QUERY_RESULTS_EXPIRED_TTL = int(os.environ.get("REDASH_QUERY_RESULTS_EXPIRED_TTL", "86400"))
5151

5252
SCHEMAS_REFRESH_SCHEDULE = int(os.environ.get("REDASH_SCHEMAS_REFRESH_SCHEDULE", 30))
53+
SCHEMAS_REFRESH_TIMEOUT = int(os.environ.get("REDASH_SCHEMAS_REFRESH_TIMEOUT", 300))
5354

5455
AUTH_TYPE = os.environ.get("REDASH_AUTH_TYPE", "api_key")
5556
INVITATION_TOKEN_MAX_AGE = int(os.environ.get("REDASH_INVITATION_TOKEN_MAX_AGE", 60 * 60 * 24 * 7))

redash/tasks/general.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def test_connection(data_source_id):
5050
return True
5151

5252

53-
@job("schemas", queue_class=Queue, at_front=True, timeout=300, ttl=90)
53+
@job("schemas", queue_class=Queue, at_front=True, timeout=settings.SCHEMAS_REFRESH_TIMEOUT, ttl=90)
5454
def get_schema(data_source_id, refresh):
5555
try:
5656
data_source = models.DataSource.get_by_id(data_source_id)

redash/tasks/queries/maintenance.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ def remove_ghost_locks():
157157
logger.info("Locks found: {}, Locks removed: {}".format(len(locks), count))
158158

159159

160-
@job("schemas")
160+
@job("schemas", timeout=settings.SCHEMAS_REFRESH_TIMEOUT)
161161
def refresh_schema(data_source_id):
162162
ds = models.DataSource.get_by_id(data_source_id)
163163
logger.info("task=refresh_schema state=start ds_id=%s", ds.id)

0 commit comments

Comments
 (0)