Skip to content

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

Set bigquery transport options with read timeout (#69306)

Riley Thompson9cd60a5d777c
diff --git a/modules/drivers/bigquery-cloud-sdk/src/metabase/driver/bigquery_cloud_sdk.clj b/modules/drivers/bigquery-cloud-sdk/src/metabase/driver/bigquery_cloud_sdk.clj
index 47fe881028e..20c470a0d47 100644
--- a/modules/drivers/bigquery-cloud-sdk/src/metabase/driver/bigquery_cloud_sdk.clj
+++ b/modules/drivers/bigquery-cloud-sdk/src/metabase/driver/bigquery_cloud_sdk.clj
@@ -12,6 +12,7 @@
[metabase.driver.bigquery-cloud-sdk.params :as bigquery.params]
[metabase.driver.bigquery-cloud-sdk.query-processor :as bigquery.qp]
[metabase.driver.common.table-rows-sample :as table-rows-sample]
+ [metabase.driver.settings :as driver.settings]
[metabase.driver.sql :as driver.sql]
[metabase.driver.sql-jdbc :as driver.sql-jdbc]
[metabase.driver.sql-jdbc.sync.describe-database :as sql-jdbc.describe-database]
@@ -62,6 +63,7 @@
TableDefinition$Type
TableId
TableResult)
+ (com.google.cloud.http HttpTransportOptions)
(com.google.cloud.iam.admin.v1 IAMClient IAMSettings)
(com.google.cloud.resourcemanager.v3 ProjectsClient ProjectsSettings)
(com.google.common.collect ImmutableMap)
@@ -111,9 +113,14 @@
user-agent (format "Metabase/%s (GPN:Metabase; %s)" mb-version run-mode)
header-provider (FixedHeaderProvider/create
(ImmutableMap/of "user-agent" user-agent))
+ read-timeout-ms driver.settings/*query-timeout-ms*
+ transport-options (-> (HttpTransportOptions/newBuilder)
+ (.setReadTimeout read-timeout-ms)
+ (.build))
bq-bldr (doto (BigQueryOptions/newBuilder)
(.setCredentials final-creds)
- (.setHeaderProvider header-provider))]
+ (.setHeaderProvider header-provider)
+ (.setTransportOptions transport-options))]
(when-let [host (not-empty (:host details))]
(.setHost bq-bldr host))
(.. bq-bldr build getService)))
diff --git a/modules/drivers/bigquery-cloud-sdk/test/metabase/driver/bigquery_cloud_sdk_test.clj b/modules/drivers/bigquery-cloud-sdk/test/metabase/driver/bigquery_cloud_sdk_test.clj
index b5609192057..96ae85203a9 100644
--- a/modules/drivers/bigquery-cloud-sdk/test/metabase/driver/bigquery_cloud_sdk_test.clj
+++ b/modules/drivers/bigquery-cloud-sdk/test/metabase/driver/bigquery_cloud_sdk_test.clj
@@ -9,6 +9,8 @@
[metabase.driver.bigquery-cloud-sdk :as bigquery]
[metabase.driver.bigquery-cloud-sdk.common :as bigquery.common]
[metabase.driver.common.table-rows-sample :as table-rows-sample]
+ [metabase.driver.settings :as driver.settings]
+ [metabase.lib.core :as lib]
[metabase.query-processor :as qp]
[metabase.query-processor.compile :as qp.compile]
[metabase.query-processor.pipeline :as qp.pipeline]
@@ -1316,6 +1318,26 @@
(is (= user-agent
(-> client .getOptions .getUserAgent)))))))
+(deftest ^:parallel read-timeout-is-configured-test
+ (mt/test-driver :bigquery-cloud-sdk
+ (testing "Read timeout is configured as the query-timeout-ms setting"
+ (let [^BigQuery client (#'bigquery/database-details->client (:details (mt/db)))
+ options (.getOptions client)
+ transport-options (.getTransportOptions options)]
+ (is (= driver.settings/*query-timeout-ms*
+ (.getReadTimeout transport-options)))))))
+
+(deftest query-fails-after-read-timeout-ms-test
+ (mt/test-driver :bigquery-cloud-sdk
+ (testing "bigquery queries fail when they take longer than the read timeout"
+ (binding [driver.settings/*query-timeout-ms* 1]
+ (is (thrown-with-msg?
+ clojure.lang.ExceptionInfo
+ #"Invalid output: \[\"should be some, got: nil\"\]"
+ (-> (mt/metadata-provider)
+ (lib/native-query "select 1")
+ (qp/process-query))))))))
+
(deftest ^:parallel timestamp-precision-test
(mt/test-driver :bigquery-cloud-sdk
(let [sql (str "select"