From: Lukas Wagner <l.wagner@proxmox.com>
To: pdm-devel@lists.proxmox.com
Subject: [pdm-devel] [PATCH proxmox-datacenter-manager v6 08/23] metric collection: add test for fetch_overdue
Date: Thu, 21 Aug 2025 11:53:04 +0200 [thread overview]
Message-ID: <20250821095319.134215-9-l.wagner@proxmox.com> (raw)
In-Reply-To: <20250821095319.134215-1-l.wagner@proxmox.com>
This test ensure that the logic for fetching metrics from remotes which
are overdue for collection continues to work as expected.
Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
Reviewed-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
.../src/metric_collection/collection_task.rs | 62 ++++++++++++++++++-
1 file changed, 60 insertions(+), 2 deletions(-)
diff --git a/server/src/metric_collection/collection_task.rs b/server/src/metric_collection/collection_task.rs
index 35f85c79..f2fe42a4 100644
--- a/server/src/metric_collection/collection_task.rs
+++ b/server/src/metric_collection/collection_task.rs
@@ -80,7 +80,8 @@ impl MetricCollectionTask {
// Check and fetch any remote which would be overdue by the time the
// timer first fires.
if let Some(remote_config) = Self::load_remote_config() {
- self.fetch_overdue(&remote_config, first_tick).await;
+ self.fetch_overdue(&remote_config, first_tick, DEFAULT_COLLECTION_INTERVAL)
+ .await;
}
loop {
@@ -217,6 +218,7 @@ impl MetricCollectionTask {
&mut self,
remote_config: &SectionConfigData<Remote>,
next_run: Instant,
+ collection_interval: u64,
) {
let left_until_scheduled = next_run - Instant::now();
let now = proxmox_time::epoch_i64();
@@ -232,7 +234,7 @@ impl MetricCollectionTask {
let diff = now - last_collection;
- if diff + left_until_scheduled.as_secs() as i64 > DEFAULT_COLLECTION_INTERVAL as i64 {
+ if diff + left_until_scheduled.as_secs() as i64 > collection_interval as i64 {
log::debug!(
"starting metric collection for remote '{remote}' - triggered because collection is overdue"
);
@@ -547,4 +549,60 @@ pub(super) mod tests {
drop(task);
assert_eq!(handle.await.unwrap(), 2);
}
+
+ #[tokio::test]
+ async fn test_fetch_overdue() {
+ // Arrange
+ test_init();
+
+ let (tx, rx) = tokio::sync::mpsc::channel(10);
+ let handle = tokio::task::spawn(fake_rrd_task(rx));
+
+ let config = make_remote_config();
+
+ let state_file = NamedTempFile::new(get_create_options()).unwrap();
+ let mut state = MetricCollectionState::new(state_file.path().into(), get_create_options());
+
+ let now = proxmox_time::epoch_i64();
+
+ // This one should be fetched
+ state.set_status(
+ "pve-0-pass".into(),
+ RemoteStatus {
+ last_collection: Some(now - 35),
+ ..Default::default()
+ },
+ );
+ // This one should *not* be fetched
+ state.set_status(
+ "pve-1-pass".into(),
+ RemoteStatus {
+ last_collection: Some(now - 25),
+ ..Default::default()
+ },
+ );
+
+ let (_control_tx, control_rx) = tokio::sync::mpsc::channel(10);
+
+ let mut task = MetricCollectionTask {
+ state,
+ metric_data_tx: tx,
+ control_message_rx: control_rx,
+ };
+
+ let next_collection = Instant::now() + Duration::from_secs(30);
+
+ // Act
+ task.fetch_overdue(&config, next_collection, 60).await;
+
+ // Assert
+ let status = task.state.get_status("pve-0-pass").unwrap();
+ assert!(status.last_collection.unwrap() - now >= 0);
+
+ let status = task.state.get_status("pve-1-pass").unwrap();
+ assert_eq!(status.last_collection.unwrap(), now - 25);
+
+ drop(task);
+ assert_eq!(handle.await.unwrap(), 1);
+ }
}
--
2.47.2
_______________________________________________
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-08-21 9:54 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-21 9:52 [pdm-devel] [PATCH proxmox-datacenter-manager v6 00/23] metric collection improvements (concurrency, API, CLI) Lukas Wagner
2025-08-21 9:52 ` [pdm-devel] [PATCH proxmox-datacenter-manager v6 01/23] metric collection: split top_entities split into separate module Lukas Wagner
2025-08-21 9:52 ` [pdm-devel] [PATCH proxmox-datacenter-manager v6 02/23] metric collection: save metric data to RRD in separate task Lukas Wagner
2025-08-21 9:52 ` [pdm-devel] [PATCH proxmox-datacenter-manager v6 03/23] metric collection: rework metric poll task Lukas Wagner
2025-08-21 9:53 ` [pdm-devel] [PATCH proxmox-datacenter-manager v6 04/23] metric collection: persist state after metric collection Lukas Wagner
2025-08-21 9:53 ` [pdm-devel] [PATCH proxmox-datacenter-manager v6 05/23] metric collection: skip if last_collection < MIN_COLLECTION_INTERVAL Lukas Wagner
2025-08-21 9:53 ` [pdm-devel] [PATCH proxmox-datacenter-manager v6 06/23] metric collection: collect overdue metrics on startup/timer change Lukas Wagner
2025-08-21 9:53 ` [pdm-devel] [PATCH proxmox-datacenter-manager v6 07/23] metric collection: add tests for the fetch_remotes function Lukas Wagner
2025-08-21 9:53 ` Lukas Wagner [this message]
2025-08-21 9:53 ` [pdm-devel] [PATCH proxmox-datacenter-manager v6 09/23] metric collection: pass rrd cache instance as function parameter Lukas Wagner
2025-08-21 9:53 ` [pdm-devel] [PATCH proxmox-datacenter-manager v6 10/23] metric collection: add test for rrd task Lukas Wagner
2025-08-21 9:53 ` [pdm-devel] [PATCH proxmox-datacenter-manager v6 11/23] metric collection: wrap rrd_cache::Cache in a struct Lukas Wagner
2025-08-21 9:53 ` [pdm-devel] [PATCH proxmox-datacenter-manager v6 12/23] metric collection: record remote response time in metric database Lukas Wagner
2025-08-21 9:53 ` [pdm-devel] [PATCH proxmox-datacenter-manager v6 13/23] metric collection: save time needed for collection run to RRD Lukas Wagner
2025-08-21 9:53 ` [pdm-devel] [PATCH proxmox-datacenter-manager v6 14/23] metric collection: periodically clean removed remotes from statefile Lukas Wagner
2025-08-21 9:53 ` [pdm-devel] [PATCH proxmox-datacenter-manager v6 15/23] api: add endpoint to trigger metric collection Lukas Wagner
2025-08-21 9:53 ` [pdm-devel] [PATCH proxmox-datacenter-manager v6 16/23] api: remotes: trigger immediate metric collection for newly added nodes Lukas Wagner
2025-08-21 9:53 ` [pdm-devel] [PATCH proxmox-datacenter-manager v6 17/23] api: add api for querying metric collection RRD data Lukas Wagner
2025-08-21 9:53 ` [pdm-devel] [PATCH proxmox-datacenter-manager v6 18/23] api: metric-collection: add status endpoint Lukas Wagner
2025-08-21 9:53 ` [pdm-devel] [PATCH proxmox-datacenter-manager v6 19/23] pdm-client: add metric collection API methods Lukas Wagner
2025-08-21 9:53 ` [pdm-devel] [PATCH proxmox-datacenter-manager v6 20/23] cli: add commands for metric-collection trigger and status Lukas Wagner
2025-08-21 9:53 ` [pdm-devel] [PATCH proxmox-datacenter-manager v6 21/23] metric collection: factor out handle_tick and handle_control_message fns Lukas Wagner
2025-08-21 9:53 ` [pdm-devel] [PATCH proxmox-datacenter-manager v6 22/23] metric collection: skip missed timer ticks Lukas Wagner
2025-08-21 9:53 ` [pdm-devel] [PATCH proxmox-datacenter-manager v6 23/23] metric collection: use JoinSet instead of joining from handles in a Vec Lukas Wagner
2025-08-21 12:53 ` [pdm-devel] [PATCH proxmox-datacenter-manager v6 00/23] metric collection improvements (concurrency, API, CLI) Dominik Csapak
2025-08-21 13:46 ` Lukas Wagner
2025-08-22 11:27 ` Dominik Csapak
2025-08-27 7:19 ` Thomas Lamprecht
2025-08-22 11:51 ` Dominik Csapak
2025-08-22 12:49 ` Dominik Csapak
2025-08-25 8:43 ` Lukas Wagner
2025-08-26 13:53 ` [pdm-devel] superseded: " 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=20250821095319.134215-9-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.