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 v4 07/26] metric collection: skip if last_collection < MIN_COLLECTION_INTERVAL
Date: Mon, 12 May 2025 15:37:06 +0200	[thread overview]
Message-ID: <20250512133725.262263-8-l.wagner@proxmox.com> (raw)
In-Reply-To: <20250512133725.262263-1-l.wagner@proxmox.com>

It makes sense to limit the collection frequency per remote, especially
since we will have the ability to trigger collection manually.

Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
Reviewed-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
 server/src/metric_collection/collection_task.rs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/server/src/metric_collection/collection_task.rs b/server/src/metric_collection/collection_task.rs
index 24ffbaa5..05740973 100644
--- a/server/src/metric_collection/collection_task.rs
+++ b/server/src/metric_collection/collection_task.rs
@@ -14,7 +14,7 @@ use proxmox_sys::fs::CreateOptions;
 
 use pdm_api_types::{
     remotes::{Remote, RemoteType},
-    CollectionSettings,
+    CollectionSettings, MIN_COLLECTION_INTERVAL,
 };
 use pdm_config::metric_collection::COLLECTION_SETTINGS_TYPE;
 
@@ -193,6 +193,7 @@ impl MetricCollectionTask {
     ) {
         let semaphore = Arc::new(Semaphore::new(MAX_CONCURRENT_CONNECTIONS));
         let mut handles = Vec::new();
+        let now = proxmox_time::epoch_i64();
 
         for remote_name in remotes_to_fetch {
             let status = self
@@ -201,6 +202,13 @@ impl MetricCollectionTask {
                 .cloned()
                 .unwrap_or_default();
 
+            if now - status.last_collection.unwrap_or(0) < MIN_COLLECTION_INTERVAL as i64 {
+                log::debug!(
+                    "skipping metric collection for remote '{remote_name}' - data is recent enough"
+                );
+                continue;
+            }
+
             // unwrap is okay here, acquire_* will only fail if `close` has been
             // called on the semaphore.
             let permit = Arc::clone(&semaphore).acquire_owned().await.unwrap();
-- 
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-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 ` Lukas Wagner [this message]
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 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 09/26] metric collection: add tests for the fetch_remotes function Lukas Wagner
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-8-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