From 9c8586e39a3806114eff86db0abb2973cfae8959 Mon Sep 17 00:00:00 2001 From: t8y2 <1156263951@qq.com> Date: Fri, 22 May 2026 17:43:57 +0800 Subject: [PATCH] fix(oracle): retry alternate connect descriptor --- crates/dbx-core/src/connection.rs | 68 +++++++++++++++++++++++++++- src-tauri/src/commands/connection.rs | 41 +++++++++++++++-- 2 files changed, 104 insertions(+), 5 deletions(-) diff --git a/crates/dbx-core/src/connection.rs b/crates/dbx-core/src/connection.rs index 651330d385..6d698d973b 100644 --- a/crates/dbx-core/src/connection.rs +++ b/crates/dbx-core/src/connection.rs @@ -280,7 +280,28 @@ impl AppState { let connect_result = client.call_method::(AgentMethod::Connect, connect_params.clone()).await; if let Err(err) = connect_result { - if should_retry_oracle_with_10g_driver(&db_config, &err) { + if let Some(alternate_config) = oracle_alternate_connect_config(&db_config, &err) { + log::warn!( + "Oracle connect failed with {:?} descriptor: {}. Retrying with {:?} descriptor.", + db_config.oracle_connection_type, + err, + alternate_config.oracle_connection_type + ); + client + .call_method::( + AgentMethod::Connect, + agent_connect_params( + &alternate_config, + &host, + port, + alternate_config.effective_database().unwrap_or(""), + ), + ) + .await + .map_err(|alternate_err| { + format!("{err}\n\nFallback with alternate Oracle descriptor failed: {alternate_err}") + })?; + } else if should_retry_oracle_with_10g_driver(&db_config, &err) { log::warn!( "Oracle connect failed with profile {:?}: {}. Retrying with oracle-10g profile.", db_config.driver_profile, @@ -616,6 +637,19 @@ pub fn should_retry_oracle_with_10g_driver(config: &ConnectionConfig, err: &str) normalized.contains("ora-12541") || normalized.contains("no listener") || err.contains("没有监听程序") } +pub fn oracle_alternate_connect_config(config: &ConnectionConfig, err: &str) -> Option { + if !should_retry_oracle_with_10g_driver(config, err) { + return None; + } + + let mut retry = config.clone(); + retry.oracle_connection_type = Some( + if config.oracle_connection_type.as_deref() == Some("service_name") { "sid" } else { "service_name" } + .to_string(), + ); + Some(retry) +} + fn sap_hana_jdbc_connection_string(config: &ConnectionConfig, host: &str, port: u16, database: &str) -> String { let database = database.trim(); let params = config.url_params.as_deref().unwrap_or("").trim().trim_start_matches('?'); @@ -866,6 +900,38 @@ mod tests { )); } + #[test] + fn oracle_listener_errors_can_retry_with_alternate_connect_descriptor() { + let mut config = mysql_config(Some("ORCL")); + config.db_type = DatabaseType::Oracle; + config.driver_profile = Some("oracle".to_string()); + config.oracle_connection_type = Some("service_name".to_string()); + + let retry = super::oracle_alternate_connect_config(&config, "Agent RPC error (-1): ORA-12541: TNS:no listener") + .expect("listener errors should allow alternate descriptor retry"); + assert_eq!(retry.driver_profile.as_deref(), Some("oracle")); + assert_eq!(retry.oracle_connection_type.as_deref(), Some("sid")); + + let service_retry = super::oracle_alternate_connect_config( + &retry, + "Agent RPC error (-1): ORA-12541: host xxx port 1521 中没有监听程序", + ) + .expect("SID listener errors should allow service-name retry"); + assert_eq!(service_retry.oracle_connection_type.as_deref(), Some("service_name")); + } + + #[test] + fn oracle_alternate_descriptor_retry_skips_non_listener_errors_and_10g_profiles() { + let mut config = mysql_config(Some("ORCL")); + config.db_type = DatabaseType::Oracle; + config.driver_profile = Some("oracle".to_string()); + + assert!(super::oracle_alternate_connect_config(&config, "ORA-01017: invalid username/password").is_none()); + + config.driver_profile = Some("oracle-10g".to_string()); + assert!(super::oracle_alternate_connect_config(&config, "ORA-12541: TNS:no listener").is_none()); + } + #[test] fn agent_connect_params_build_saphana_connection_string_from_database_and_url_params() { let mut config = mysql_config(Some("TENANT1")); diff --git a/src-tauri/src/commands/connection.rs b/src-tauri/src/commands/connection.rs index b744298e4d..5433ad3abd 100644 --- a/src-tauri/src/commands/connection.rs +++ b/src-tauri/src/commands/connection.rs @@ -3,8 +3,8 @@ use tauri::State; pub use dbx_core::connection::{ agent_connect_params, connection_url_for_endpoint, expand_tilde, metadata_connection_config, - mongo_legacy_error_with_auth_hint, probe_connection_endpoint, redacted_connection_url_for_endpoint, - should_retry_oracle_with_10g_driver, AppState, MysqlMode, PoolKind, + mongo_legacy_error_with_auth_hint, oracle_alternate_connect_config, probe_connection_endpoint, + redacted_connection_url_for_endpoint, should_retry_oracle_with_10g_driver, AppState, MysqlMode, PoolKind, }; use dbx_core::database_capabilities; use dbx_core::db; @@ -35,7 +35,25 @@ async fn test_agent_connection( .await; if let Err(err) = result { - if should_retry_oracle_with_10g_driver(config, &err) { + if let Some(alternate_config) = oracle_alternate_connect_config(config, &err) { + state + .agent_manager + .call_daemon_method::( + &alternate_config.db_type, + alternate_config.driver_profile.as_deref(), + AgentMethod::TestConnection, + agent_connect_params( + &alternate_config, + host, + port, + alternate_config.database.as_deref().unwrap_or(""), + ), + ) + .await + .map_err(|alternate_err| { + format!("{err}\n\nFallback with alternate Oracle descriptor failed: {alternate_err}") + })?; + } else if should_retry_oracle_with_10g_driver(config, &err) { state .agent_manager .call_daemon_method::( @@ -65,7 +83,22 @@ async fn connect_agent_pool( let connect_result = client.call_method::(AgentMethod::Connect, connect_params.clone()).await; if let Err(err) = connect_result { - if should_retry_oracle_with_10g_driver(config, &err) { + if let Some(alternate_config) = oracle_alternate_connect_config(config, &err) { + client + .call_method::( + AgentMethod::Connect, + agent_connect_params( + &alternate_config, + host, + port, + alternate_config.effective_database().unwrap_or(""), + ), + ) + .await + .map_err(|alternate_err| { + format!("{err}\n\nFallback with alternate Oracle descriptor failed: {alternate_err}") + })?; + } else if should_retry_oracle_with_10g_driver(config, &err) { let mut fallback_client = state.agent_manager.spawn(&config.db_type, Some("oracle-10g")).await?; fallback_client .call_method::(AgentMethod::Connect, connect_params)