From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pdm-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 0BE181FF164 for <inbox@lore.proxmox.com>; Fri, 14 Feb 2025 14:07:17 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E2D1E19B98; Fri, 14 Feb 2025 14:07:13 +0100 (CET) From: Lukas Wagner <l.wagner@proxmox.com> To: pdm-devel@lists.proxmox.com Date: Fri, 14 Feb 2025 14:06:34 +0100 Message-Id: <20250214130653.283012-10-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250214130653.283012-1-l.wagner@proxmox.com> References: <20250214130653.283012-1-l.wagner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.010 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 v2 09/28] 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 <pdm-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pdm-devel>, <mailto:pdm-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pdm-devel/> List-Post: <mailto:pdm-devel@lists.proxmox.com> List-Help: <mailto:pdm-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel>, <mailto:pdm-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox Datacenter Manager development discussion <pdm-devel@lists.proxmox.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pdm-devel-bounces@lists.proxmox.com Sender: "pdm-devel" <pdm-devel-bounces@lists.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> --- 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 f985bd3e..744a7ccc 100644 --- a/server/src/metric_collection/collection_task.rs +++ b/server/src/metric_collection/collection_task.rs @@ -15,7 +15,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; @@ -219,6 +219,7 @@ impl MetricCollectionTask { self.settings.max_concurrent_connections_or_default(), )); let mut handles = Vec::new(); + let now = proxmox_time::epoch_i64(); for remote_name in remotes_to_fetch { let status = self @@ -227,6 +228,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