[FIXUP] Use dbQueryTimeout in CH driver

Author: mcheshkov

packages/cubejs-backend-shared/src/env.ts

@@ -532,7 +532,7 @@ const variables: Record<string, (...args: any) => any> = {
   },
 
   /**
-   * Query timeout. Currently used in BigQuery, Dremio, Postgres, Snowflake
+   * Query timeout. Currently used in BigQuery, ClickHouse, Dremio, Postgres, Snowflake
    * and Athena drivers and the orchestrator (queues, pre-aggs). For the
    * orchestrator this variable did not split by the datasource.
    *

packages/cubejs-clickhouse-driver/src/ClickHouseDriver.ts

@@ -66,6 +66,11 @@ export interface ClickHouseDriverOptions {
   protocol?: string,
   database?: string,
   readOnly?: boolean,
+  /**
+   * Timeout in milliseconds for requests to ClickHouse.
+   * Default is 10 minutes
+   */
+  requestTimeout?: number,
 
   /**
    * Data source name.
@@ -104,6 +109,7 @@ type ClickHouseDriverConfig = {
   password: string,
   readOnly: boolean,
   database: string,
+  requestTimeout: number,
   exportBucket: ClickhouseDriverExportAWS | null,
   clickhouseSettings: ClickHouseSettings,
 };
@@ -149,13 +155,18 @@ export class ClickHouseDriver extends BaseDriver implements DriverInterface {
     this.readOnlyMode =
       getEnv('clickhouseReadOnly', { dataSource }) === 'true';
 
+    // Expect that getEnv('dbQueryTimeout') will always return a value
+    const requestTimeoutEnv: number = getEnv('dbQueryTimeout', { dataSource }) * 1000;
+    const requestTimeout = config.requestTimeout ?? requestTimeoutEnv;
+
     this.config = {
       url,
       username,
       password,
       database,
       exportBucket: this.getExportBucket(dataSource),
       readOnly: !!config.readOnly,
+      requestTimeout,
       clickhouseSettings: {
         // If ClickHouse user's permissions are restricted with "readonly = 1",
         // change settings queries are not allowed. Thus, "join_use_nulls" setting
@@ -208,6 +219,7 @@ export class ClickHouseDriver extends BaseDriver implements DriverInterface {
       password: this.config.password,
       database: this.config.database,
       clickhouse_settings: this.config.clickhouseSettings,
+      request_timeout: this.config.requestTimeout,
       max_open_connections: maxPoolSize,
     });
   }