all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Lukas Wagner <l.wagner@proxmox.com>
To: pdm-devel@lists.proxmox.com
Subject: [pdm-devel] [PATCH proxmox-datacenter-manager v3 10/26] metric collection: add test for fetch_overdue
Date: Wed, 16 Apr 2025 14:56:26 +0200	[thread overview]
Message-ID: <20250416125642.291552-11-l.wagner@proxmox.com> (raw)
In-Reply-To: <20250416125642.291552-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, 62 insertions(+)

diff --git a/server/src/metric_collection/collection_task.rs b/server/src/metric_collection/collection_task.rs
index 4331e9aa..1fc3be11 100644
--- a/server/src/metric_collection/collection_task.rs
+++ b/server/src/metric_collection/collection_task.rs
@@ -596,4 +596,66 @@ 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 settings = CollectionSettings {
+            collection_interval: Some(60),
+            ..Default::default()
+        };
+
+        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,
+            settings,
+            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).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.39.5



_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel


  parent reply	other threads:[~2025-04-16 12:56 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-04-16 12:56 [pdm-devel] [PATCH proxmox-datacenter-manager v3 00/26] metric collection improvements (concurrency, config, API, CLI) Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 01/26] pdm-api-types: add CollectionSettings type Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 02/26] pdm-config: add functions for reading/writing metric collection settings Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 03/26] metric collection: split top_entities split into separate module Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 04/26] metric collection: save metric data to RRD in separate task Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 05/26] metric collection: rework metric poll task Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 06/26] metric collection: persist state after metric collection Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 07/26] metric collection: skip if last_collection < MIN_COLLECTION_INTERVAL Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 08/26] metric collection: collect overdue metrics on startup/timer change Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 09/26] metric collection: add tests for the fetch_remotes function Lukas Wagner
2025-04-16 12:56 ` Lukas Wagner [this message]
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 11/26] metric collection: pass rrd cache instance as function parameter Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 12/26] metric collection: add test for rrd task Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 13/26] metric collection: wrap rrd_cache::Cache in a struct Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 14/26] metric collection: record remote response time in metric database Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 15/26] metric collection: save time needed for collection run to RRD Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 16/26] metric collection: periodically clean removed remotes from statefile Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 17/26] api: add endpoint for updating metric collection settings Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 18/26] api: add endpoint to trigger metric collection Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 19/26] api: remotes: trigger immediate metric collection for newly added nodes Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 20/26] api: add api for querying metric collection RRD data Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 21/26] api: metric-collection: add status endpoint Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 22/26] pdm-client: add metric collection API methods Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 23/26] cli: add commands for metric-collection settings, trigger, status Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 24/26] metric collection: factor out handle_tick and handle_control_message fns Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 25/26] metric collection: skip missed timer ticks Lukas Wagner
2025-04-16 12:56 ` [pdm-devel] [PATCH proxmox-datacenter-manager v3 26/26] metric collection: use JoinSet instead of joining from handles in a Vec Lukas Wagner
2025-05-12 13:38 ` [pdm-devel] superseded: [PATCH proxmox-datacenter-manager v3 00/26] metric collection improvements (concurrency, config, API, CLI) 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=20250416125642.291552-11-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