From fdf5555f11c405393a01284dacc6d08871631989 Mon Sep 17 00:00:00 2001
From: mujunxiang <1948535941@qq.com>
Date: Tue, 3 Dec 2024 10:36:03 +0800
Subject: [PATCH] rebase main

Signed-off-by: mujunxiang <1948535941@qq.com>
---
 ecstore/Cargo.toml              |  1 -
 ecstore/src/peer_rest_client.rs |  8 ++++++--
 rustfs/src/grpc.rs              | 12 +++---------
 rustfs/src/main.rs              |  1 -
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/ecstore/Cargo.toml b/ecstore/Cargo.toml
index 4fce9a183..316355bef 100644
--- a/ecstore/Cargo.toml
+++ b/ecstore/Cargo.toml
@@ -64,7 +64,6 @@ pin-project-lite.workspace = true
 md-5.workspace = true
 madmin.workspace = true
 workers.workspace = true
-madmin.workspace = true
 
 [target.'cfg(not(windows))'.dependencies]
 
diff --git a/ecstore/src/peer_rest_client.rs b/ecstore/src/peer_rest_client.rs
index 4bd115912..d60b537d0 100644
--- a/ecstore/src/peer_rest_client.rs
+++ b/ecstore/src/peer_rest_client.rs
@@ -1,8 +1,12 @@
 use std::{collections::HashMap, io::Cursor, time::SystemTime};
 
 use crate::{
-    admin_server_info::ServerProperties, endpoints::EndpointServerPools, global::is_dist_erasure,
-    heal::heal_commands::BgHealState, store_api::StorageInfo,
+    admin_server_info::ServerProperties,
+    endpoints::EndpointServerPools,
+    global::is_dist_erasure,
+    heal::heal_commands::BgHealState,
+    metrics_realtime::{CollectMetricsOpts, MetricType},
+    store_api::StorageInfo,
 };
 use common::error::{Error, Result};
 use madmin::{
diff --git a/rustfs/src/grpc.rs b/rustfs/src/grpc.rs
index 9e9180af0..25c3391d9 100644
--- a/rustfs/src/grpc.rs
+++ b/rustfs/src/grpc.rs
@@ -14,10 +14,8 @@ use ecstore::{
     },
     erasure::Writer,
     heal::{
-        
         data_usage_cache::DataUsageCache,
-       
-        heal_commands::{get_local_background_heal_status, {get_local_background_heal_status, HealOpts},
+        heal_commands::{get_local_background_heal_status, HealOpts},
     },
     metrics_realtime::{collect_local_metrics, CollectMetricsOpts, MetricType},
     new_object_layer_fn,
@@ -29,12 +27,8 @@ use futures::{Stream, StreamExt};
 use lock::{lock_args::LockArgs, Locker, GLOBAL_LOCAL_SERVER};
 
 use common::globals::GLOBAL_Local_Node_Name;
-use madmin::net::get_net_info;
-use madmin::{
-    health::{
-        get_cpus, get_mem_info, get_os_info, get_partitions, get_proc_info, get_sys_config, get_sys_errors, get_sys_services,
-    },
-    metrics::{collect_local_metrics, CollectMetricsOpts},
+use madmin::health::{
+    get_cpus, get_mem_info, get_os_info, get_partitions, get_proc_info, get_sys_config, get_sys_errors, get_sys_services,
 };
 use madmin::net::get_net_info;
 use protos::{
diff --git a/rustfs/src/main.rs b/rustfs/src/main.rs
index be239520d..4303f2fe0 100644
--- a/rustfs/src/main.rs
+++ b/rustfs/src/main.rs
@@ -14,7 +14,6 @@ use ecstore::utils::net::{self, get_available_port};
 use ecstore::{
     endpoints::EndpointServerPools,
     heal::data_scanner::init_data_scanner,
-    notification_sys::new_global_notification_sys,
     set_global_endpoints,
     store::{init_local_disks, ECStore},
     update_erasure_type,