From 13b53efb2ad2ad352f5448f93b3c85b0f877df50 Mon Sep 17 00:00:00 2001
From: mujunxiang <1948535941@qq.com>
Date: Wed, 27 Nov 2024 14:44:01 +0800
Subject: [PATCH] fix rebase err

Signed-off-by: mujunxiang <1948535941@qq.com>
---
 Cargo.lock                       |  1 -
 ecstore/src/admin_server_info.rs |  6 +++++-
 ecstore/src/pools.rs             | 18 +++++++++++-------
 madmin/src/health.rs             |  2 +-
 rustfs/Cargo.toml                |  1 -
 rustfs/src/main.rs               |  1 +
 rustfs/src/peer_rest_client.rs   |  8 ++++----
 7 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0422aed7d..a65c7ab5f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2242,7 +2242,6 @@ dependencies = [
  "protobuf",
  "protos",
  "rmp-serde",
- "router",
  "s3s",
  "serde",
  "serde_json",
diff --git a/ecstore/src/admin_server_info.rs b/ecstore/src/admin_server_info.rs
index e6df440b9..5d4d9a8f9 100644
--- a/ecstore/src/admin_server_info.rs
+++ b/ecstore/src/admin_server_info.rs
@@ -104,7 +104,11 @@ pub async fn get_local_server_property() -> ServerProperties {
     let mut pool_numbers = HashSet::new();
     let mut network = HashMap::new();
 
-    for ep in GLOBAL_Endpoints.read().await.as_ref().iter() {
+    let endpoints = match GLOBAL_Endpoints.get() {
+        Some(eps) => eps,
+        None => return ServerProperties::default(),
+    };
+    for ep in endpoints.as_ref().iter() {
         for endpoint in ep.endpoints.as_ref().iter() {
             let node_name = match endpoint.url.host_str() {
                 Some(s) => s.to_string(),
diff --git a/ecstore/src/pools.rs b/ecstore/src/pools.rs
index da57427b7..f732fc2ff 100644
--- a/ecstore/src/pools.rs
+++ b/ecstore/src/pools.rs
@@ -171,7 +171,7 @@ pub struct PoolSpaceInfo {
 impl ECStore {
     pub async fn status(&self, idx: usize) -> Result<PoolStatus> {
         let space_info = self.get_decommission_pool_space_info(idx).await?;
-        let mut pool_info = self.pool_meta.pools[idx].clone();
+        let mut pool_info = self.pool_meta.read().unwrap().pools[idx].clone();
         if let Some(d) = pool_info.decommission.as_mut() {
             d.total_size = space_info.total;
             d.current_size = space_info.free;
@@ -217,7 +217,7 @@ impl ECStore {
             return Err(Error::new(StorageError::DecommissionNotStarted));
         }
 
-        if self.pool_meta.decommission_cancel(idx) {
+        if self.pool_meta.write().unwrap().decommission_cancel(idx) {
             // FIXME:
         }
 
@@ -225,11 +225,15 @@ impl ECStore {
     }
 }
 
-fn _get_total_usable_capacity(disks: &Vec<StorageDisk>, _info: &StorageInfo) -> usize {
-    for _disk in disks.iter() {
-        // if disk.pool_index < 0 || info.backend.standard_scdata.len() <= disk.pool_index {
-        //     continue;
-        // }
+fn get_total_usable_capacity(disks: &Vec<StorageDisk>, info: &StorageInfo) -> usize {
+    let mut capacity = 0;
+    for disk in disks.iter() {
+        if disk.pool_index < 0 || info.backend.standard_sc_data.len() <= disk.pool_index as usize {
+            continue;
+        }
+        if (disk.disk_index as usize) < info.backend.standard_sc_data[disk.pool_index as usize] {
+            capacity += disk.total_space as usize;
+        }
     }
     capacity
 }
diff --git a/madmin/src/health.rs b/madmin/src/health.rs
index be9f5cb4c..25d3fec9a 100644
--- a/madmin/src/health.rs
+++ b/madmin/src/health.rs
@@ -117,7 +117,7 @@ pub struct ProcInfo {
     username: String,
 }
 
-pub fn get_proc_info(addr: &str) -> ProcInfo {
+pub fn get_proc_info(_addr: &str) -> ProcInfo {
     ProcInfo::default()
 }
 
diff --git a/rustfs/Cargo.toml b/rustfs/Cargo.toml
index 133653913..efb93c056 100644
--- a/rustfs/Cargo.toml
+++ b/rustfs/Cargo.toml
@@ -61,7 +61,6 @@ matchit = "0.8.4"
 shadow-rs = "0.35.2"
 const-str = { version = "0.5.7", features = ["std", "proc"] }
 atoi = "2.0.0"
-serde.workspace = true
 serde_urlencoded = "0.7.1"
 
 [build-dependencies]
diff --git a/rustfs/src/main.rs b/rustfs/src/main.rs
index cef94af64..4b25b819f 100644
--- a/rustfs/src/main.rs
+++ b/rustfs/src/main.rs
@@ -1,6 +1,7 @@
 mod admin;
 mod config;
 mod grpc;
+#[allow(dead_code)]
 mod peer_rest_client;
 mod service;
 mod storage;
diff --git a/rustfs/src/peer_rest_client.rs b/rustfs/src/peer_rest_client.rs
index d24f17a9d..b52802673 100644
--- a/rustfs/src/peer_rest_client.rs
+++ b/rustfs/src/peer_rest_client.rs
@@ -531,7 +531,7 @@ impl PeerRestClient {
         Ok(())
     }
 
-    pub async fn signal_service(&self, sig: u64, sub_sys: &str, dry_run: bool, exec_at: SystemTime) -> Result<()> {
+    pub async fn signal_service(&self, sig: u64, sub_sys: &str, dry_run: bool, _exec_at: SystemTime) -> Result<()> {
         let mut client = node_service_time_out_client(&self.addr)
             .await
             .map_err(|err| Error::msg(err.to_string()))?;
@@ -575,14 +575,14 @@ impl PeerRestClient {
     }
 
     pub async fn get_metacache_listing(&self) -> Result<()> {
-        let mut client = node_service_time_out_client(&self.addr)
+        let mut _client = node_service_time_out_client(&self.addr)
             .await
             .map_err(|err| Error::msg(err.to_string()))?;
         todo!()
     }
 
     pub async fn update_metacache_listing(&self) -> Result<()> {
-        let mut client = node_service_time_out_client(&self.addr)
+        let mut _client = node_service_time_out_client(&self.addr)
             .await
             .map_err(|err| Error::msg(err.to_string()))?;
         todo!()
@@ -639,7 +639,7 @@ impl PeerRestClient {
         Ok(())
     }
 
-    pub async fn load_transition_tier_config(&self, start_rebalance: bool) -> Result<()> {
+    pub async fn load_transition_tier_config(&self) -> Result<()> {
         let mut client = node_service_time_out_client(&self.addr)
             .await
             .map_err(|err| Error::msg(err.to_string()))?;