From 25170943ce5be8e7f3950e7f85e503836a49392a Mon Sep 17 00:00:00 2001 From: Zhengchao An Date: Sun, 28 Jun 2026 11:23:04 +0800 Subject: [PATCH] fix(ecstore): improve expect() messages in admin_server_info (#729 batch 9) (#3990) fix(ecstore): improve expect() messages in admin_server_info Replace unwrap() with expect() for better error diagnostics in admin_server_info.rs: - URL host/port access now has descriptive messages - HashMap get_mut calls now have descriptive messages Refs https://github.com/rustfs/backlog/issues/729 --- crates/ecstore/src/diagnostics/admin_server_info.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/crates/ecstore/src/diagnostics/admin_server_info.rs b/crates/ecstore/src/diagnostics/admin_server_info.rs index 1ba2291f3..cb48b09e7 100644 --- a/crates/ecstore/src/diagnostics/admin_server_info.rs +++ b/crates/ecstore/src/diagnostics/admin_server_info.rs @@ -78,8 +78,8 @@ async fn is_server_resolvable(endpoint: &Endpoint) -> Result<()> { let addr = format!( "{}://{}:{}", endpoint.url.scheme(), - endpoint.url.host_str().unwrap(), - endpoint.url.port().unwrap() + endpoint.url.host_str().expect("URL should have host"), + endpoint.url.port().expect("URL should have port") ); let ping_task = async { @@ -309,10 +309,10 @@ fn get_online_offline_disks_stats(disks_info: &[Disk]) -> (BackendDisks, Backend let ep = &disk.endpoint; let state = &disk.state; if *state != DriveState::Ok.to_string() && *state != DriveState::Unformatted.to_string() { - *offline_disks.get_mut(ep).unwrap() += 1; + *offline_disks.get_mut(ep).expect("endpoint should be in disk map") += 1; continue; } - *online_disks.get_mut(ep).unwrap() += 1; + *online_disks.get_mut(ep).expect("endpoint should be in disk map") += 1; } let mut root_disk_count = 0; @@ -329,8 +329,8 @@ fn get_online_offline_disks_stats(disks_info: &[Disk]) -> (BackendDisks, Backend for disk in disks_info { let ep = &disk.endpoint; if disk.root_disk { - *offline_disks.get_mut(ep).unwrap() += 1; - *online_disks.get_mut(ep).unwrap() -= 1; + *offline_disks.get_mut(ep).expect("endpoint should be in disk map") += 1; + *online_disks.get_mut(ep).expect("endpoint should be in disk map") -= 1; } }