Skip to content

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

Abort initial sync status when metadata fetch fails (#75660)

Eric Normand8083e6e3aaa8
diff --git a/src/metabase/sync/sync_metadata.clj b/src/metabase/sync/sync_metadata.clj
index ee99278028e..2128a5d42b7 100644
--- a/src/metabase/sync/sync_metadata.clj
+++ b/src/metabase/sync/sync_metadata.clj
@@ -64,8 +64,12 @@
"Shared core of [[sync-db-metadata!]] and [[sync-db-metadata-explicit!]]: the metadata sync work,
without the surrounding `*-sync-operation` wrapper (which is what applies the eligibility gating)."
[database :- i/DatabaseInstance]
- (let [db-metadata (tracing/with-span :sync "sync.metadata.fetch-metadata" {:db/id (:id database)}
- (fetch-metadata/db-metadata database))]
+ (let [db-metadata (try
+ (tracing/with-span :sync "sync.metadata.fetch-metadata" {:db/id (:id database)}
+ (fetch-metadata/db-metadata database))
+ (catch Throwable e
+ (sync-util/set-initial-database-sync-aborted! database)
+ (throw e)))]
(u/prog1 (sync-util/run-sync-operation "sync" database (make-sync-steps db-metadata))
(if (some sync-util/abandon-sync? (map second (:steps <>)))
(sync-util/set-initial-database-sync-aborted! database)
diff --git a/test/metabase/sync/sync_metadata_test.clj b/test/metabase/sync/sync_metadata_test.clj
index 3866d067465..c17ce4000ac 100644
--- a/test/metabase/sync/sync_metadata_test.clj
+++ b/test/metabase/sync/sync_metadata_test.clj
@@ -1,12 +1,16 @@
(ns metabase.sync.sync-metadata-test
(:require
[clojure.test :refer :all]
+ [metabase.sync.fetch-metadata :as fetch-metadata]
+ [metabase.sync.sync-metadata :as sync-metadata]
[metabase.sync.sync-metadata.fields :as sync-fields]
[metabase.sync.sync-metadata.fks :as sync-fks]
[metabase.sync.sync-metadata.metabase-metadata :as metabase-metadata]
[metabase.sync.sync-metadata.sync-timezone :as sync-tz]
[metabase.sync.sync-metadata.tables :as sync-tables]
- [metabase.test.sync :refer [sync-survives-crash?!]]))
+ [metabase.test :as mt]
+ [metabase.test.sync :refer [sync-survives-crash?!]]
+ [toucan2.core :as t2]))
(deftest survive-metadata-errors
(testing "Make sure we survive metadata sync failing"
@@ -29,3 +33,13 @@
(deftest survive-fk-errors
(testing "Make sure we survive FK sync failing"
(sync-survives-crash?! sync-fks/mark-fk!)))
+
+(deftest metadata-fetch-failure-aborts-initial-sync-test
+ (testing "When fetching DB metadata throws (e.g. Athena lacking glue:GetDatabases, GHY-3534),"
+ (testing "the initial sync status is marked aborted instead of left stuck at \"incomplete\""
+ (mt/with-temp [:model/Database db {:initial_sync_status "incomplete"}]
+ (with-redefs [fetch-metadata/db-metadata (fn [_] (throw (ex-info "boom" {})))]
+ (is (thrown? Throwable
+ (#'sync-metadata/sync-db-metadata!* db))))
+ (is (= "aborted"
+ (t2/select-one-fn :initial_sync_status :model/Database (:id db))))))))