feat(agents): remove legacy Oracle Java agents
This commit is contained in:
1 parent
7486d35a0f
commit
6c232899b4
24 files changed
+66
-2012
No files matched your search
@@ -251,9 +251,6 @@ pub fn oracle_alternate_connect_configs(config: &ConnectionConfig, err: &str) ->
|
||||
if config.db_type != DatabaseType::Oracle {
|
||||
return Vec::new();
|
||||
}
|
||||
if config.driver_profile.as_deref() == Some("oracle-10g") {
|
||||
return Vec::new();
|
||||
}
|
||||
if config.connection_string.as_deref().is_some_and(|value| !value.trim().is_empty()) {
|
||||
return Vec::new();
|
||||
}
|
||||
@@ -402,21 +399,6 @@ fn postgres_like_agent_jdbc_connection_string(
|
||||
append_agent_url_params(base, config.url_params.as_deref())
|
||||
}
|
||||
|
||||
pub fn should_retry_oracle_with_10g_driver(config: &ConnectionConfig, err: &str) -> bool {
|
||||
!oracle_auth_fallback_profiles(config, err).is_empty()
|
||||
}
|
||||
|
||||
pub fn oracle_auth_fallback_profiles(config: &ConnectionConfig, err: &str) -> Vec<&'static str> {
|
||||
if config.db_type != DatabaseType::Oracle {
|
||||
return Vec::new();
|
||||
}
|
||||
let normalized = err.to_lowercase();
|
||||
if !normalized.contains("ora-28040") && !normalized.contains("no matching authentication protocol") {
|
||||
return Vec::new();
|
||||
}
|
||||
Vec::new()
|
||||
}
|
||||
|
||||
pub fn oracle_alternate_connect_config(config: &ConnectionConfig, err: &str) -> Option<ConnectionConfig> {
|
||||
oracle_alternate_connect_configs(config, err).into_iter().next()
|
||||
}
|
||||
@@ -749,10 +731,9 @@ mod tests {
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn oracle_listener_error_hint_skips_other_databases() {
|
||||
fn oracle_listener_error_hint_skips_non_oracle_databases() {
|
||||
let err = "Agent RPC error (-1): ORA-12541: TNS:no listener";
|
||||
let mut cfg = config(DatabaseType::Oracle, Some("ORCL"));
|
||||
cfg.driver_profile = Some("oracle-legacy".to_string());
|
||||
|
||||
assert!(oracle_error_with_driver_hint(&cfg, err).contains("Service Name"));
|
||||
|
||||
@@ -909,20 +890,6 @@ mod tests {
|
||||
assert!(oracle_alternate_connect_config(&cfg, "ORA-12541: TNS:no listener").is_some());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn oracle_auth_errors_do_not_switch_driver_profiles() {
|
||||
let mut cfg = config(DatabaseType::Oracle, Some("ORCL"));
|
||||
cfg.driver_profile = Some("oracle".to_string());
|
||||
|
||||
assert!(oracle_auth_fallback_profiles(&cfg, "ORA-28040: No matching authentication protocol").is_empty());
|
||||
|
||||
cfg.driver_profile = Some("oracle-legacy".to_string());
|
||||
assert!(oracle_auth_fallback_profiles(&cfg, "ORA-28040: No matching authentication protocol").is_empty());
|
||||
|
||||
cfg.driver_profile = Some("oracle-10g".to_string());
|
||||
assert!(oracle_auth_fallback_profiles(&cfg, "ORA-28040: No matching authentication protocol").is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn oracle_custom_connection_string_skips_alternate_descriptor_retry() {
|
||||
let mut cfg = config(DatabaseType::Oracle, Some("ORCL"));
|
||||
|
||||
@@ -215,8 +215,7 @@ mod tests {
|
||||
assert_eq!(AgentManager::db_type_to_agent_key(&DatabaseType::Oracle, None), Some("oracle"));
|
||||
assert_eq!(AgentManager::db_type_to_agent_key(&DatabaseType::Gbase, Some("gbase8s")), Some("gbase8s"));
|
||||
assert_eq!(AgentManager::db_type_to_agent_key(&DatabaseType::Gbase, None), Some("gbase8a"));
|
||||
manager.stop_daemon_by_key("oracle-legacy").await;
|
||||
manager.stop_daemon_by_key("oracle-10g").await;
|
||||
manager.stop_daemon_by_key("oracle").await;
|
||||
manager.stop_daemon_by_key("gbase8s").await;
|
||||
}
|
||||
|
||||
@@ -486,7 +485,7 @@ impl AgentManager {
|
||||
if flat.exists() {
|
||||
return flat;
|
||||
}
|
||||
// macOS Adoptium JRE 8 uses Contents/Home/ layout
|
||||
// Some macOS runtimes are unpacked with a Contents/Home/ layout.
|
||||
let macos = dir.join("Contents").join("Home").join("bin").join(java_name);
|
||||
if macos.exists() {
|
||||
return macos;
|
||||
|
||||
@@ -127,13 +127,6 @@ pub async fn call_daemon_method_with_timeout<T: DeserializeOwned + Send + 'stati
|
||||
|
||||
fn runtime_agent_key_candidates(db_type: &DatabaseType, driver_profile: Option<&str>) -> Option<Vec<&'static str>> {
|
||||
let primary = db_type_to_agent_key(db_type, driver_profile)?;
|
||||
if *db_type == DatabaseType::Oracle {
|
||||
return match driver_profile {
|
||||
Some("oracle-legacy") => Some(vec![primary, "oracle-legacy"]),
|
||||
Some("oracle-10g") => Some(vec![primary, "oracle-10g"]),
|
||||
_ => Some(vec![primary]),
|
||||
};
|
||||
}
|
||||
Some(vec![primary])
|
||||
}
|
||||
|
||||
|
||||
@@ -11,8 +11,7 @@ use mysql_async::Row as MysqlRow;
|
||||
use crate::agent_connection::{
|
||||
agent_connect_params, h2_file_path_from_jdbc_url, is_h2_file_connection, mongo_legacy_error_with_auth_hint,
|
||||
mongo_uses_legacy_driver, oracle_alternate_connect_config_labels, oracle_alternate_connect_configs,
|
||||
oracle_auth_fallback_profiles, oracle_error_with_driver_hint, should_retry_mongo_with_legacy_driver,
|
||||
should_retry_oracle_with_10g_driver, trino_like_jdbc_connection_string,
|
||||
oracle_error_with_driver_hint, should_retry_mongo_with_legacy_driver, trino_like_jdbc_connection_string,
|
||||
};
|
||||
use crate::agent_manager::{JavaRuntimeMode, DEFAULT_JRE_KEY};
|
||||
use crate::database_capabilities;
|
||||
@@ -899,7 +898,7 @@ impl AppState {
|
||||
let connect_result = client
|
||||
.call_method_with_timeout::<serde_json::Value>(
|
||||
AgentMethod::Connect,
|
||||
connect_params.clone(),
|
||||
connect_params,
|
||||
Some(agent_connect_timeout(&db_config)),
|
||||
)
|
||||
.await;
|
||||
@@ -947,45 +946,6 @@ impl AppState {
|
||||
fallback_errors.join("\n")
|
||||
));
|
||||
}
|
||||
} else if should_retry_oracle_with_10g_driver(&db_config, &err) {
|
||||
log::warn!(
|
||||
"Oracle connect failed with profile {:?}: {}. Retrying with legacy Oracle profiles.",
|
||||
db_config.driver_profile,
|
||||
err
|
||||
);
|
||||
let mut fallback_errors = Vec::new();
|
||||
let mut connected_client = None;
|
||||
for profile in oracle_auth_fallback_profiles(&db_config, &err) {
|
||||
match self.agent_manager.spawn(&db_config.db_type, Some(profile)).await {
|
||||
Ok(mut fallback_client) => {
|
||||
match fallback_client
|
||||
.call_method_with_timeout::<serde_json::Value>(
|
||||
AgentMethod::Connect,
|
||||
connect_params.clone(),
|
||||
Some(agent_connect_timeout(&db_config)),
|
||||
)
|
||||
.await
|
||||
{
|
||||
Ok(_) => {
|
||||
connected_client = Some(fallback_client);
|
||||
break;
|
||||
}
|
||||
Err(fallback_err) => {
|
||||
fallback_errors.push(format!("{profile}: {fallback_err}"));
|
||||
}
|
||||
}
|
||||
}
|
||||
Err(fallback_err) => {
|
||||
fallback_errors.push(format!("{profile}: {fallback_err}"));
|
||||
}
|
||||
}
|
||||
}
|
||||
client = connected_client.ok_or_else(|| {
|
||||
format!(
|
||||
"{err}\n\nFallback with legacy Oracle drivers failed: {}",
|
||||
fallback_errors.join("\n")
|
||||
)
|
||||
})?;
|
||||
} else {
|
||||
return Err(oracle_error_with_driver_hint(&db_config, &err));
|
||||
}
|
||||
@@ -2398,7 +2358,7 @@ mod tests {
|
||||
};
|
||||
use crate::agent_connection::{
|
||||
agent_connect_params, mongo_legacy_error_with_auth_hint, mongo_uses_legacy_driver,
|
||||
oracle_alternate_connect_config, should_retry_mongo_with_legacy_driver, should_retry_oracle_with_10g_driver,
|
||||
oracle_alternate_connect_config, should_retry_mongo_with_legacy_driver,
|
||||
};
|
||||
use crate::agent_manager::{AgentState, JavaRuntimeConfig, JavaRuntimeMode, DEFAULT_JRE_KEY};
|
||||
use crate::database_capabilities;
|
||||
@@ -2692,33 +2652,6 @@ mod tests {
|
||||
assert_eq!(params["connection_string"], "jdbc:oracle:thin:@//127.0.0.1:11521/ORCL");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn oracle_retry_guard_only_triggers_for_non_10g_listener_errors() {
|
||||
let mut config = mysql_config(Some("ORCL"));
|
||||
config.db_type = DatabaseType::Oracle;
|
||||
config.driver_profile = Some("oracle".to_string());
|
||||
|
||||
assert!(!should_retry_oracle_with_10g_driver(
|
||||
&config,
|
||||
"Agent RPC error (-1): ORA-28040: No matching authentication protocol"
|
||||
));
|
||||
assert!(!should_retry_oracle_with_10g_driver(&config, "Agent RPC error (-1): ORA-12541: TNS:no listener"));
|
||||
assert!(!should_retry_oracle_with_10g_driver(&config, "host xxx port 1521 中没有监听程序"));
|
||||
|
||||
config.driver_profile = Some("oracle-10g".to_string());
|
||||
assert!(!should_retry_oracle_with_10g_driver(&config, "Agent RPC error (-1): ORA-12541: TNS:no listener"));
|
||||
assert!(!should_retry_oracle_with_10g_driver(
|
||||
&config,
|
||||
"Agent RPC error (-1): ORA-28040: No matching authentication protocol"
|
||||
));
|
||||
|
||||
config.driver_profile = Some("oracle".to_string());
|
||||
assert!(!should_retry_oracle_with_10g_driver(
|
||||
&config,
|
||||
"Agent RPC error (-1): ORA-01017: invalid username/password"
|
||||
));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn oracle_listener_errors_can_retry_with_alternate_connect_descriptor() {
|
||||
let mut config = mysql_config(Some("ORCL"));
|
||||
@@ -2747,15 +2680,12 @@ mod tests {
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn oracle_alternate_descriptor_retry_skips_non_listener_errors_and_10g_profiles() {
|
||||
fn oracle_alternate_descriptor_retry_skips_non_listener_errors() {
|
||||
let mut config = mysql_config(Some("ORCL"));
|
||||
config.db_type = DatabaseType::Oracle;
|
||||
config.driver_profile = Some("oracle".to_string());
|
||||
|
||||
assert!(oracle_alternate_connect_config(&config, "ORA-01017: invalid username/password").is_none());
|
||||
|
||||
config.driver_profile = Some("oracle-10g".to_string());
|
||||
assert!(oracle_alternate_connect_config(&config, "ORA-12514: listener does not know service").is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
||||
@@ -1104,9 +1104,7 @@ fn agent_java_args(jar_path: &str) -> Vec<String> {
|
||||
args.push("-Djava.net.preferIPv4Stack=true".to_string());
|
||||
}
|
||||
|
||||
if !agent_jar_path_matches_key(jar_path, "oracle-10g") {
|
||||
args.push("--add-opens=java.sql/java.sql=ALL-UNNAMED".to_string());
|
||||
}
|
||||
args.push("--add-opens=java.sql/java.sql=ALL-UNNAMED".to_string());
|
||||
|
||||
args.extend(["-XX:TieredStopAtLevel=1", "-XX:+UseSerialGC", "-jar", jar_path].into_iter().map(str::to_string));
|
||||
|
||||
@@ -1286,13 +1284,6 @@ mod tests {
|
||||
assert!(args.iter().any(|arg| arg == "--add-opens=java.sql/java.sql=ALL-UNNAMED"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn agent_java_args_skip_module_flags_for_oracle_10g_profile() {
|
||||
let args = agent_java_args("/tmp/dbx/drivers/oracle-10g/agent.jar");
|
||||
|
||||
assert!(!args.iter().any(|arg| arg == "--add-opens=java.sql/java.sql=ALL-UNNAMED"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn agent_java_args_disable_ambient_proxy_settings() {
|
||||
let args = agent_java_args("/tmp/dbx-agent-opengauss.jar");
|
||||
|
||||
Reference in new issue
Block a user