Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Fix parameter selection cutoff when refreshing the cache (#79272)

metamben628a3220ff83
diff --git a/enterprise/backend/src/metabase_enterprise/cache/task/refresh_cache_configs.clj b/enterprise/backend/src/metabase_enterprise/cache/task/refresh_cache_configs.clj
index a090e4bc672..175049c2b84 100644
--- a/enterprise/backend/src/metabase_enterprise/cache/task/refresh_cache_configs.clj
+++ b/enterprise/backend/src/metabase_enterprise/cache/task/refresh_cache_configs.clj
@@ -238,14 +238,14 @@
(defn- refresh-schedule-cache!
"Given a cache config with the :schedule strategy, preemptively rerun the query (and a fixed number of parameterized
variants) so that fresh results are cached."
- [{model :model
- model-id :model_id
- strategy :strategy
- last-run-at :last_run_at
- created-at :created_at
- :as cache-config}]
+ [{model :model
+ model-id :model_id
+ strategy :strategy
+ invalidated-at :invalidated_at
+ created-at :created_at
+ :as cache-config}]
(assert (= strategy :schedule))
- (let [rerun-cutoff (or last-run-at created-at)
+ (let [rerun-cutoff (or invalidated-at created-at)
card-ids (schedule-cache-config->card-ids cache-config)
dashboard-id (when (= model "dashboard") model-id)
refresh-defs (distinct
diff --git a/enterprise/backend/test/metabase_enterprise/cache/task/refresh_cache_configs_test.clj b/enterprise/backend/test/metabase_enterprise/cache/task/refresh_cache_configs_test.clj
index ee4fefdf285..517151571e9 100644
--- a/enterprise/backend/test/metabase_enterprise/cache/task/refresh_cache_configs_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/cache/task/refresh_cache_configs_test.clj
@@ -561,6 +561,38 @@
(finally
(delete-cache-entry! original-cache-entry))))))))))))
+(deftest refresh-schedule-cache-uses-invalidated-at-cutoff-test
+ ;; Regression for #78341.
+ (binding [task.cache/*run-cache-refresh-async* false]
+ (mt/with-temp [:model/Card {card-id :id} {:name "Cached card"
+ :dataset_query (parameterized-native-query)}]
+ (let [created-at (t/minus (t/offset-date-time) (t/days 30))
+ invalidated-at (t/minus (t/offset-date-time) (t/hours 1))
+ captured (atom nil)
+ capture-cutoff
+ (fn [cache-config]
+ (reset! captured ::not-called)
+ (mt/with-dynamic-fn-redefs [task.cache/scheduled-queries-to-rerun
+ (fn [_card-id cutoff]
+ (reset! captured cutoff)
+ [])]
+ (@#'task.cache/refresh-schedule-cache! cache-config))
+ @captured)]
+ (testing "rerun-cutoff is the previous refresh (invalidated_at), not the config's created_at"
+ (is (= invalidated-at
+ (capture-cutoff {:model "question"
+ :model_id card-id
+ :strategy :schedule
+ :created_at created-at
+ :invalidated_at invalidated-at}))))
+ (testing "falls back to created_at when the config has never been invalidated (first run)"
+ (is (= created-at
+ (capture-cutoff {:model "question"
+ :model_id card-id
+ :strategy :schedule
+ :created_at created-at
+ :invalidated_at nil}))))))))
+
(deftest refresh-duration-cache-card-e2e-test
(mt/with-premium-features #{:cache-granular-controls :cache-preemptive}
(testing "Do we successfully execute a refresh query for a :duration cache config on a card?\n"