From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 3935B1FF172 for ; Wed, 16 Apr 2025 14:57:22 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DC8D937015; Wed, 16 Apr 2025 14:57:20 +0200 (CEST) From: Lukas Wagner To: pdm-devel@lists.proxmox.com Date: Wed, 16 Apr 2025 14:56:23 +0200 Message-Id: <20250416125642.291552-8-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250416125642.291552-1-l.wagner@proxmox.com> References: <20250416125642.291552-1-l.wagner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.015 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pdm-devel] [PATCH proxmox-datacenter-manager v3 07/26] metric collection: skip if last_collection < MIN_COLLECTION_INTERVAL X-BeenThere: pdm-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Datacenter Manager development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Datacenter Manager development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pdm-devel-bounces@lists.proxmox.com Sender: "pdm-devel" 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 Reviewed-by: Maximiliano Sandoval --- 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 ce3d650d..1e613e86 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; @@ -192,6 +192,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 @@ -200,6 +201,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