diff --git a/ecstore/src/heal/heal_ops.rs b/ecstore/src/heal/heal_ops.rs index b7b694b41..ed774ecbe 100644 --- a/ecstore/src/heal/heal_ops.rs +++ b/ecstore/src/heal/heal_ops.rs @@ -2,7 +2,7 @@ use super::{ background_heal_ops::HealTask, data_scanner::HEAL_DELETE_DANGLING, error::ERR_SKIP_FILE, - heal_commands::{HealOpts, HealScanMode, HealStopSuccess, HealingTracker, HEAL_ITEM_BUCKET_METADATA}, + heal_commands::{HealOpts, HealScanMode, HealStopSuccess, HealingDisk, HealingTracker, HEAL_ITEM_BUCKET_METADATA}, }; use crate::store_api::StorageAPI; use crate::{ diff --git a/ecstore/src/notification_sys.rs b/ecstore/src/notification_sys.rs index 8a994d939..aaf6d4d12 100644 --- a/ecstore/src/notification_sys.rs +++ b/ecstore/src/notification_sys.rs @@ -32,7 +32,7 @@ pub struct NotificationSys { impl NotificationSys { pub async fn new(eps: EndpointServerPools) -> Self { - let (peer_clients, all_peer_clients) = PeerRestClient::new_clients(eps).await; + let (peer_clients, all_peer_clients) = PeerRestClient::new_clients(&eps).await; Self { peer_clients, all_peer_clients, @@ -46,9 +46,7 @@ pub struct NotificationPeerErr { } impl NotificationSys { - pub fn rest_client_from_hash(&self, s:&str) ->Option{ - - + pub fn rest_client_from_hash(&self, s: &str) -> Option { None } pub async fn delete_policy(&self) -> Vec { diff --git a/ecstore/src/store_api.rs b/ecstore/src/store_api.rs index fc37c3ccc..48a860fee 100644 --- a/ecstore/src/store_api.rs +++ b/ecstore/src/store_api.rs @@ -9,6 +9,7 @@ use crate::{ use futures::StreamExt; use http::HeaderMap; use madmin::heal_commands::HealResultItem; +use madmin::info_commands::DiskMetrics; use rmp_serde::Serializer; use s3s::{dto::StreamingBlob, Body}; use serde::{Deserialize, Serialize}; diff --git a/madmin/Cargo.toml b/madmin/Cargo.toml index 5a32ec152..1d385f9b9 100644 --- a/madmin/Cargo.toml +++ b/madmin/Cargo.toml @@ -18,3 +18,4 @@ psutil = "3.3.0" serde.workspace = true time.workspace =true tracing.workspace = true +time.workspace =true diff --git a/rustfs/src/admin/handlers/trace.rs b/rustfs/src/admin/handlers/trace.rs index 0134c4fd6..cf3c1710a 100644 --- a/rustfs/src/admin/handlers/trace.rs +++ b/rustfs/src/admin/handlers/trace.rs @@ -4,6 +4,7 @@ use hyper::Uri; use madmin::service_commands::ServiceTraceOpts; use matchit::Params; use s3s::{s3_error, Body, S3Request, S3Response, S3Result}; +use tokio::sync::mpsc; use tracing::warn; use crate::admin::router::Operation; @@ -24,11 +25,11 @@ impl Operation for Trace { async fn call(&self, req: S3Request, _params: Params<'_, '_>) -> S3Result> { warn!("handle Trace"); - let _trace_opts = extract_trace_options(&req.uri)?; + let trace_opts = extract_trace_options(&req.uri)?; // let (tx, rx) = mpsc::channel(10000); - let _perrs = match GLOBAL_Endpoints.get() { - Some(ep) => PeerRestClient::new_clients(ep.clone()).await, + let perrs = match GLOBAL_Endpoints.get() { + Some(ep) => PeerRestClient::new_clients(ep).await, None => (Vec::new(), Vec::new()), }; return Err(s3_error!(NotImplemented));