From 02308a6f78321e381502bbdfe49e20c5a8b47f11 Mon Sep 17 00:00:00 2001 From: Ville Brofeldt <33317356+villebro@users.noreply.github.com> Date: Fri, 25 Mar 2022 16:19:35 +0200 Subject: [PATCH] fix(caching): support metastore cache for non-required caches (#19369) * fix(caching): support metastore cache for non-required caches * lint --- superset/utils/cache_manager.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/superset/utils/cache_manager.py b/superset/utils/cache_manager.py index f7bb8d9e8f89..c67644f308b1 100644 --- a/superset/utils/cache_manager.py +++ b/superset/utils/cache_manager.py @@ -40,7 +40,7 @@ def _init_cache( ) -> None: cache_config = app.config[cache_config_key] cache_type = cache_config.get("CACHE_TYPE") - if required and cache_type in (None, "SupersetMetastoreCache"): + if (required and cache_type is None) or cache_type == "SupersetMetastoreCache": if cache_type is None and not app.debug: logger.warning( "Falling back to the built-in cache, that stores data in the " @@ -49,12 +49,13 @@ def _init_cache( "another dedicated caching backend for production deployments", cache_config_key, ) + cache_type = CACHE_IMPORT_PATH cache_key_prefix = cache_config.get("CACHE_KEY_PREFIX", cache_config_key) cache_config.update( - {"CACHE_TYPE": CACHE_IMPORT_PATH, "CACHE_KEY_PREFIX": cache_key_prefix} + {"CACHE_TYPE": cache_type, "CACHE_KEY_PREFIX": cache_key_prefix} ) - if "CACHE_DEFAULT_TIMEOUT" not in cache_config: + if cache_type is not None and "CACHE_DEFAULT_TIMEOUT" not in cache_config: default_timeout = app.config.get("CACHE_DEFAULT_TIMEOUT") cache_config["CACHE_DEFAULT_TIMEOUT"] = default_timeout