diff --git a/crates/dbx-core/src/connection.rs b/crates/dbx-core/src/connection.rs index 3b614ec9aa..8d07283cdf 100644 --- a/crates/dbx-core/src/connection.rs +++ b/crates/dbx-core/src/connection.rs @@ -139,7 +139,15 @@ impl AppState { pub async fn test_external_driver(&self, driver_id: &str, config: &ConnectionConfig) -> Result { let params = serde_json::json!({ "connection": config }); let env = self.external_driver_runtime_env(driver_id)?; - self.plugins.invoke_driver_with_env::(driver_id, "testConnection", params, env).await?; + self.plugins + .invoke_driver_with_env_and_timeout::( + driver_id, + "testConnection", + params, + env, + Some(external_driver_connect_timeout(config)), + ) + .await?; Ok("Connection successful".to_string()) } @@ -147,7 +155,9 @@ impl AppState { let env = self.external_driver_runtime_env(driver_id)?; let session = self.plugins.start_driver_session_with_env(driver_id, env).await?; let params = serde_json::json!({ "connection": config }); - session.invoke::("connect", params).await?; + session + .invoke_with_timeout::("connect", params, Some(external_driver_connect_timeout(config))) + .await?; Ok(PoolKind::ExternalDriver { driver_id: driver_id.to_string(), config: Arc::new(config.clone()), session }) } @@ -832,6 +842,10 @@ pub fn redacted_connection_url_for_endpoint(config: &ConnectionConfig, host: &st } } +fn external_driver_connect_timeout(config: &ConnectionConfig) -> std::time::Duration { + std::time::Duration::from_secs(config.effective_connect_timeout_secs().max(30)) +} + fn native_postgres_url_config(config: &ConnectionConfig) -> Option { match config.db_type { DatabaseType::Gaussdb | DatabaseType::OpenGauss => { diff --git a/crates/dbx-core/src/plugins.rs b/crates/dbx-core/src/plugins.rs index dd5aab0e1b..8af6cc6d15 100644 --- a/crates/dbx-core/src/plugins.rs +++ b/crates/dbx-core/src/plugins.rs @@ -138,15 +138,33 @@ impl PluginRegistry { params: serde_json::Value, env: PluginRuntimeEnv, ) -> Result + where + T: DeserializeOwned, + { + self.invoke_driver_with_env_and_timeout(driver_id, method, params, env, Some(PLUGIN_REQUEST_TIMEOUT)).await + } + + pub async fn invoke_driver_with_env_and_timeout( + &self, + driver_id: &str, + method: &str, + params: serde_json::Value, + env: PluginRuntimeEnv, + timeout_duration: Option, + ) -> Result where T: DeserializeOwned, { let plugin = self.find_driver(driver_id)?.ok_or_else(|| format!("Plugin driver '{driver_id}' is not installed"))?; ensure_plugin_protocol_compatible(&plugin.manifest)?; - timeout(PLUGIN_REQUEST_TIMEOUT, invoke_plugin(&plugin, driver_id, method, params, &env)).await.map_err( - |_| format!("Plugin '{}' timed out after {} seconds", plugin.manifest.id, PLUGIN_REQUEST_TIMEOUT.as_secs()), - )? + let invoke = invoke_plugin(&plugin, driver_id, method, params, &env); + match timeout_duration { + Some(duration) => timeout(duration, invoke).await.map_err(|_| { + format!("Plugin '{}' timed out after {} seconds", plugin.manifest.id, duration.as_secs()) + })?, + None => invoke.await, + } } pub async fn start_driver_session(&self, driver_id: &str) -> Result, String> { diff --git a/plugins/jdbc/src/main/java/app/dbx/jdbc/DbxJdbcPlugin.java b/plugins/jdbc/src/main/java/app/dbx/jdbc/DbxJdbcPlugin.java index 6979afbf93..790224a067 100644 --- a/plugins/jdbc/src/main/java/app/dbx/jdbc/DbxJdbcPlugin.java +++ b/plugins/jdbc/src/main/java/app/dbx/jdbc/DbxJdbcPlugin.java @@ -216,6 +216,7 @@ public final class DbxJdbcPlugin { if (password != null) { properties.setProperty("password", password); } + applyConnectTimeout(connection, properties); if (isOracleUrl(url)) { properties.putIfAbsent("remarksReporting", "false"); properties.putIfAbsent("restrictGetTables", "true"); @@ -227,6 +228,14 @@ public final class DbxJdbcPlugin { return sharedConnection; } + private static void applyConnectTimeout(JsonNode connection, Properties properties) { + int connectTimeoutSecs = positiveInt(connection, "connect_timeout_secs", 30); + DriverManager.setLoginTimeout(connectTimeoutSecs); + String value = Integer.toString(connectTimeoutSecs); + properties.putIfAbsent("loginTimeout", value); + properties.putIfAbsent("connectTimeout", value); + } + private static JsonNode executeQuery( JsonNode connection, String sql, diff --git a/plugins/jdbc/src/test/java/app/dbx/jdbc/DbxJdbcPluginTest.java b/plugins/jdbc/src/test/java/app/dbx/jdbc/DbxJdbcPluginTest.java index 120a39c3d0..d115a4f63b 100644 --- a/plugins/jdbc/src/test/java/app/dbx/jdbc/DbxJdbcPluginTest.java +++ b/plugins/jdbc/src/test/java/app/dbx/jdbc/DbxJdbcPluginTest.java @@ -8,6 +8,7 @@ import org.junit.jupiter.api.Test; import java.sql.Connection; import java.sql.DriverManager; import java.lang.reflect.Method; +import java.util.Properties; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -17,7 +18,8 @@ final class DbxJdbcPluginTest { private static final String CONNECTION = """ { "connection_string": "jdbc:h2:mem:dbx_ctx;DB_CLOSE_DELAY=-1", - "username": "sa" + "username": "sa", + "connect_timeout_secs": 30 } """; @@ -105,6 +107,21 @@ final class DbxJdbcPluginTest { assertEquals(true, response.path("result").path("truncated").asBoolean()); } + @Test + void connectTimeoutIsMappedToDriverProperties() throws Exception { + Method method = DbxJdbcPlugin.class.getDeclaredMethod("applyConnectTimeout", JsonNode.class, Properties.class); + method.setAccessible(true); + Properties properties = new Properties(); + JsonNode connection = MAPPER.readTree(""" + { "connect_timeout_secs": 45 } + """); + + method.invoke(null, connection, properties); + + assertEquals("45", properties.getProperty("loginTimeout")); + assertEquals("45", properties.getProperty("connectTimeout")); + } + @Test void driverQuirksDetectYashanJdbcUrl() throws Exception { JsonNode yashan = MAPPER.readTree("""