Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

storage: only fetch metrics for managed clusters/hosts #17240

Closed
wants to merge 1 commit into from
Closed

storage: only fetch metrics for managed clusters/hosts #17240

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 23 additions & 5 deletions src/storage-client/src/controller/clusters.rs
View file
Open in desktop
Expand Up @@ -44,7 +44,20 @@ use crate::types::clusters::{StorageClusterConfig, StorageClusterResourceAllocat
use crate::types::parameters::StorageParameters;

/// The network address of a storage cluster.
pub type StorageClusterAddr = String;
#[derive(Debug, Clone, Hash, PartialEq, Eq)]
pub enum StorageClusterAddr {
Remote(String),
Managed(String),
}

impl StorageClusterAddr {
fn addr(&self) -> String {
match self {
StorageClusterAddr::Remote(network_addr) => network_addr.clone(),
StorageClusterAddr::Managed(network_addr) => network_addr.clone(),
}
}
}

/// Configuration for [`StorageClusters`].
pub struct StorageClustersConfig {
Expand Down Expand Up @@ -171,7 +184,7 @@ where
let cluster_addr = match cluster_config {
StorageClusterConfig::Remote { addr } => {
self.drop_storage_cluster(id).await?;
addr
StorageClusterAddr::Remote(addr)
}
StorageClusterConfig::Managed { allocation, .. } => {
self.ensure_storage_cluster(id, allocation).await?
Expand All @@ -194,7 +207,7 @@ where
.entry(cluster_addr.clone())
.or_insert_with(|| {
let mut client = RehydratingStorageClient::new(
cluster_addr,
cluster_addr.addr(),
self.build_info,
Arc::clone(&self.persist),
);
Expand Down Expand Up @@ -315,7 +328,9 @@ where
},
)
.await?;
Ok(storage_service.addresses("storagectl").into_element())

let addr = storage_service.addresses("storagectl").into_element();
Ok(StorageClusterAddr::Managed(addr))
}

/// Drops an orchestrated storage cluster for the specified ID.
Expand Down Expand Up @@ -421,7 +436,10 @@ impl MetricsFetcher {
.lock()
.expect("lock poisoned")
.iter()
.map(|(id, cluster_addr)| (id.clone(), cluster_addr.clone()))
.filter(|(_id, cluster_addr)| {
matches!(cluster_addr, StorageClusterAddr::Managed(_))
})
.map(|(id, cluster_addr)| (id.clone(), cluster_addr.addr()))
.collect::<Vec<_>>()
};
tracing::trace!("fetch_metrics: service_ids: {:?}", service_ids);
Expand Down