From: Lukas Wagner <l.wagner@proxmox.com>
To: pdm-devel@lists.proxmox.com
Subject: [pdm-devel] [PATCH proxmox-datacenter-manager v4 09/26] metric collection: add tests for the fetch_remotes function
Date: Mon, 12 May 2025 15:37:08 +0200 [thread overview]
Message-ID: <20250512133725.262263-10-l.wagner@proxmox.com> (raw)
In-Reply-To: <20250512133725.262263-1-l.wagner@proxmox.com>
Since we have the option to have mocked remote clients and a mocked
remote config, as well as due to the decoupling of the metric collection
and RRD task, it is now viable to write a unit test for one of the core
pieces of the metric collection system.
Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
Reviewed-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
.../src/metric_collection/collection_task.rs | 228 ++++++++++++++++++
server/src/metric_collection/state.rs | 18 +-
2 files changed, 233 insertions(+), 13 deletions(-)
diff --git a/server/src/metric_collection/collection_task.rs b/server/src/metric_collection/collection_task.rs
index 5148a591..0f94bf08 100644
--- a/server/src/metric_collection/collection_task.rs
+++ b/server/src/metric_collection/collection_task.rs
@@ -371,3 +371,231 @@ pub(super) fn load_state() -> Result<MetricCollectionState, Error> {
file_options,
))
}
+
+#[cfg(test)]
+pub(super) mod tests {
+ use std::sync::Once;
+
+ use anyhow::bail;
+ use http::StatusCode;
+
+ use pdm_api_types::Authid;
+ use pve_api_types::{ClusterMetrics, ClusterMetricsData};
+
+ use crate::{
+ connection::{ClientFactory, PveClient},
+ metric_collection::rrd_task::RrdStoreResult,
+ pbs_client::PbsClient,
+ test_support::temp::NamedTempFile,
+ };
+
+ use super::*;
+
+ pub(crate) fn get_create_options() -> CreateOptions {
+ CreateOptions::new()
+ .owner(nix::unistd::Uid::effective())
+ .group(nix::unistd::Gid::effective())
+ .perm(nix::sys::stat::Mode::from_bits_truncate(0o600))
+ }
+
+ struct TestClientFactory {
+ now: i64,
+ }
+
+ #[async_trait::async_trait]
+ impl ClientFactory for TestClientFactory {
+ fn make_pve_client(&self, remote: &Remote) -> Result<Arc<PveClient>, Error> {
+ Ok(Arc::new(TestPveClient {
+ fail: remote.id.contains("fail"),
+ now: self.now,
+ }))
+ }
+ /// Create a new API client for PVE remotes, but with a specific endpoint.
+ fn make_pve_client_with_endpoint(
+ &self,
+ _remote: &Remote,
+ _target_endpoint: Option<&str>,
+ ) -> Result<Arc<PveClient>, Error> {
+ bail!("not implemented")
+ }
+
+ fn make_pbs_client(&self, _remote: &Remote) -> Result<Box<PbsClient>, Error> {
+ bail!("not implemented")
+ }
+
+ async fn make_pve_client_and_login(
+ &self,
+ _remote: &Remote,
+ ) -> Result<Arc<PveClient>, Error> {
+ bail!("not implemented")
+ }
+
+ async fn make_pbs_client_and_login(
+ &self,
+ _remote: &Remote,
+ ) -> Result<Box<PbsClient>, Error> {
+ bail!("not implemented")
+ }
+ }
+
+ struct TestPveClient {
+ now: i64,
+ fail: bool,
+ }
+
+ #[async_trait::async_trait]
+ impl pve_api_types::client::PveClient for TestPveClient {
+ /// Retrieve metrics of the cluster.
+ async fn cluster_metrics_export(
+ &self,
+ _history: Option<bool>,
+ _local_only: Option<bool>,
+ start_time: Option<i64>,
+ ) -> Result<ClusterMetrics, proxmox_client::Error> {
+ if self.fail {
+ return Err(proxmox_client::Error::Api(
+ StatusCode::INTERNAL_SERVER_ERROR,
+ "internal server error".into(),
+ ));
+ }
+
+ let mut time = start_time.unwrap_or(0);
+ time = time.max(self.now - (30 * 60));
+ let mut data = Vec::new();
+
+ use pve_api_types::ClusterMetricsDataType::*;
+
+ while time < self.now {
+ let point = |id: &str, metric: &str, timestamp, ty| ClusterMetricsData {
+ id: id.into(),
+ metric: metric.into(),
+ timestamp,
+ ty,
+ value: 0.1,
+ };
+
+ for i in 0..5 {
+ let id = format!("node/node-{i}");
+ data.push(point(&id, "cpu_current", time, Gauge));
+ }
+
+ // Advance time by 10 seconds
+ time += 10;
+ }
+
+ Ok(ClusterMetrics { data })
+ }
+ }
+
+ fn make_remote_config() -> SectionConfigData<Remote> {
+ let mut sections = SectionConfigData::default();
+
+ for i in 0..4 {
+ let status = if i >= 2 { "fail" } else { "pass" };
+ let name = format!("pve-{i}-{status}");
+
+ sections.insert(
+ name.clone(),
+ Remote {
+ ty: pdm_api_types::remotes::RemoteType::Pve,
+ id: name.clone(),
+ nodes: Vec::new(),
+ authid: Authid::root_auth_id().clone(),
+ token: "".into(),
+ web_url: None,
+ },
+ );
+ }
+
+ sections
+ }
+
+ async fn fake_rrd_task(mut rx: Receiver<RrdStoreRequest>) -> u32 {
+ let mut number_of_requests = 0;
+
+ while let Some(request) = rx.recv().await {
+ number_of_requests += 1;
+
+ if let RrdStoreRequest::Pve {
+ metrics, channel, ..
+ } = request
+ {
+ let most_recent_timestamp =
+ metrics.data.iter().map(|e| e.timestamp).max().unwrap_or(0);
+
+ let _ = channel.send(RrdStoreResult {
+ most_recent_timestamp,
+ });
+ }
+ }
+
+ number_of_requests
+ }
+
+ static START: Once = Once::new();
+
+ fn test_init() -> i64 {
+ let now = 10000;
+ START.call_once(|| {
+ // TODO: the client factory is currently stored in a OnceLock -
+ // we can only set it from one test... Ideally we'd like to have the
+ // option to set it in every single test if needed - task/thread local?
+ connection::init(Box::new(TestClientFactory { now }));
+ });
+
+ now
+ }
+
+ #[tokio::test]
+ async fn test_fetch_remotes_updates_state() {
+ // Arrange
+ let now = test_init();
+
+ let (tx, rx) = tokio::sync::mpsc::channel(10);
+ let handle = tokio::task::spawn(fake_rrd_task(rx));
+
+ let settings = CollectionSettings::default();
+ let config = make_remote_config();
+
+ let state_file = NamedTempFile::new(get_create_options()).unwrap();
+ let state = MetricCollectionState::new(state_file.path().into(), get_create_options());
+
+ let (_control_tx, control_rx) = tokio::sync::mpsc::channel(10);
+
+ let mut task = MetricCollectionTask {
+ state,
+ settings,
+ metric_data_tx: tx,
+ control_message_rx: control_rx,
+ };
+
+ // Act
+ let to_fetch = config
+ .iter()
+ .map(|(name, _)| name.into())
+ .collect::<Vec<String>>();
+ task.fetch_remotes(&config, &to_fetch).await;
+
+ // Assert
+ for remote in &to_fetch {
+ let status = task.state.get_status(remote).unwrap();
+
+ // Our faked PVE client will return an error if the remote name contains
+ // 'fail'.
+ if remote.contains("fail") {
+ assert!(status
+ .error
+ .as_ref()
+ .unwrap()
+ .contains("internal server error"));
+ assert_eq!(status.last_collection, None);
+ } else {
+ assert!(now - status.most_recent_datapoint <= 10);
+ assert!(status.error.is_none());
+ }
+ }
+
+ drop(task);
+ assert_eq!(handle.await.unwrap(), 2);
+ }
+}
diff --git a/server/src/metric_collection/state.rs b/server/src/metric_collection/state.rs
index a0bf10fe..e76444a9 100644
--- a/server/src/metric_collection/state.rs
+++ b/server/src/metric_collection/state.rs
@@ -87,24 +87,16 @@ impl MetricCollectionState {
#[cfg(test)]
mod tests {
- use proxmox_sys::fs::CreateOptions;
+ use crate::metric_collection::collection_task::tests::get_create_options;
+ use crate::test_support::temp::NamedTempFile;
use super::*;
- use crate::test_support::temp::NamedTempFile;
-
- fn get_options() -> CreateOptions {
- CreateOptions::new()
- .owner(nix::unistd::Uid::effective())
- .group(nix::unistd::Gid::effective())
- .perm(nix::sys::stat::Mode::from_bits_truncate(0o600))
- }
-
#[test]
fn save_and_load() -> Result<(), Error> {
- let file = NamedTempFile::new(get_options())?;
- let options = get_options();
- let mut state = MetricCollectionState::new(file.path().into(), options.clone());
+ let file = NamedTempFile::new(get_create_options())?;
+ let options = get_create_options();
+ let mut state = MetricCollectionState::new(file.path().into(), options);
state.set_status(
"some-remote".into(),
--
2.39.5
_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel
next prev parent reply other threads:[~2025-05-12 13:37 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-12 13:36 [pdm-devel] [PATCH proxmox-datacenter-manager v4 00/26] metric collection improvements (concurrency, config, API, CLI) Lukas Wagner
2025-05-12 13:37 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 01/26] pdm-api-types: add CollectionSettings type Lukas Wagner
2025-05-12 13:37 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 02/26] pdm-config: add functions for reading/writing metric collection settings Lukas Wagner
2025-05-12 13:37 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 03/26] metric collection: split top_entities split into separate module Lukas Wagner
2025-05-12 13:37 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 04/26] metric collection: save metric data to RRD in separate task Lukas Wagner
2025-05-12 13:37 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 05/26] metric collection: rework metric poll task Lukas Wagner
2025-05-12 13:37 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 06/26] metric collection: persist state after metric collection Lukas Wagner
2025-05-12 13:37 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 07/26] metric collection: skip if last_collection < MIN_COLLECTION_INTERVAL Lukas Wagner
2025-05-12 13:37 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 08/26] metric collection: collect overdue metrics on startup/timer change Lukas Wagner
2025-05-12 13:37 ` Lukas Wagner [this message]
2025-05-12 13:37 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 10/26] metric collection: add test for fetch_overdue Lukas Wagner
2025-05-12 13:37 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 11/26] metric collection: pass rrd cache instance as function parameter Lukas Wagner
2025-05-12 13:37 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 12/26] metric collection: add test for rrd task Lukas Wagner
2025-05-12 13:37 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 13/26] metric collection: wrap rrd_cache::Cache in a struct Lukas Wagner
2025-05-12 13:37 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 14/26] metric collection: record remote response time in metric database Lukas Wagner
2025-05-12 13:37 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 15/26] metric collection: save time needed for collection run to RRD Lukas Wagner
2025-05-12 13:37 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 16/26] metric collection: periodically clean removed remotes from statefile Lukas Wagner
2025-05-12 13:37 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 17/26] api: add endpoint for updating metric collection settings Lukas Wagner
2025-05-12 13:37 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 18/26] api: add endpoint to trigger metric collection Lukas Wagner
2025-05-12 13:37 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 19/26] api: remotes: trigger immediate metric collection for newly added nodes Lukas Wagner
2025-05-12 13:37 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 20/26] api: add api for querying metric collection RRD data Lukas Wagner
2025-05-12 13:37 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 21/26] api: metric-collection: add status endpoint Lukas Wagner
2025-05-12 13:37 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 22/26] pdm-client: add metric collection API methods Lukas Wagner
2025-05-12 13:37 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 23/26] cli: add commands for metric-collection settings, trigger, status Lukas Wagner
2025-05-12 13:37 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 24/26] metric collection: factor out handle_tick and handle_control_message fns Lukas Wagner
2025-05-12 13:37 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 25/26] metric collection: skip missed timer ticks Lukas Wagner
2025-05-12 13:37 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 26/26] metric collection: use JoinSet instead of joining from handles in a Vec Lukas Wagner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250512133725.262263-10-l.wagner@proxmox.com \
--to=l.wagner@proxmox.com \
--cc=pdm-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal