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 [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 4E89D1FF164 for <inbox@lore.proxmox.com>; Fri, 14 Feb 2025 14:07:20 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C970C19CCE; Fri, 14 Feb 2025 14:07:18 +0100 (CET) From: Lukas Wagner <l.wagner@proxmox.com> To: pdm-devel@lists.proxmox.com Date: Fri, 14 Feb 2025 14:06:39 +0100 Message-Id: <20250214130653.283012-15-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 14/28] metric collection: add test for rrd task 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> This commit adds a quick smoke-test for the `store_in_rrd` task function. Unfortunately, due to some race-condition in proxmox_rrd, some extra measures had to be taken in order to make the test not flaky. Signed-off-by: Lukas Wagner <l.wagner@proxmox.com> --- server/src/metric_collection/rrd_task.rs | 92 ++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/server/src/metric_collection/rrd_task.rs b/server/src/metric_collection/rrd_task.rs index 3704b0e7..27327a29 100644 --- a/server/src/metric_collection/rrd_task.rs +++ b/server/src/metric_collection/rrd_task.rs @@ -138,3 +138,95 @@ fn store_metric_pbs(cache: &Cache, remote_name: &str, data_point: &MetricDataPoi data_source_type, ); } + +#[cfg(test)] +mod tests { + use proxmox_rrd_api_types::{RrdMode, RrdTimeframe}; + use pve_api_types::{ClusterMetrics, ClusterMetricsData}; + + use crate::{ + metric_collection::collection_task::tests::get_create_options, + test_support::temp::NamedTempDir, + }; + + use super::*; + + #[tokio::test] + async fn test_rrd_task_persists_data() -> Result<(), Error> { + // Arrange + let dir = NamedTempDir::new()?; + let options = get_create_options().perm(nix::sys::stat::Mode::from_bits_truncate(0o700)); + let cache = rrd_cache::init(&dir.path(), options.clone(), options.clone())?; + + let (tx, rx) = tokio::sync::mpsc::channel(10); + let task = store_in_rrd_task(Arc::clone(&cache), rx); + let handle = tokio::task::spawn(task); + + let now = proxmox_time::epoch_i64(); + + let metrics = ClusterMetrics { + data: vec![ + ClusterMetricsData { + id: "node/some-node".into(), + metric: "cpu_current".into(), + timestamp: now - 30, + ty: ClusterMetricsDataType::Gauge, + value: 0.1, + }, + ClusterMetricsData { + id: "node/some-node".into(), + metric: "cpu_current".into(), + timestamp: now - 20, + ty: ClusterMetricsDataType::Gauge, + value: 0.2, + }, + ClusterMetricsData { + id: "node/some-node".into(), + metric: "cpu_current".into(), + timestamp: now - 10, + ty: ClusterMetricsDataType::Gauge, + value: 0.1, + }, + ClusterMetricsData { + id: "node/some-node".into(), + metric: "cpu_current".into(), + timestamp: now, + ty: ClusterMetricsDataType::Gauge, + value: 0.2, + }, + ], + }; + let (tx_back, rx_back) = tokio::sync::oneshot::channel(); + let request = RrdStoreRequest::Pve { + remote: "some-remote".into(), + metrics, + channel: tx_back, + }; + + // Act + tx.send(request).await?; + let result = rx_back.await?; + + // Assert + assert_eq!(result.most_recent_timestamp, now); + + drop(tx); + handle.await??; + + // There is some race condition in proxmox_rrd, in some rare cases + // extract_data does not return any data directly after writing. + if let Some(data) = rrd_cache::extract_data( + &cache, + "pve/some-remote/node/some-node", + "cpu_current", + RrdTimeframe::Hour, + RrdMode::Max, + )? { + // Only assert that there are some data points, the exact position in the vec + // might vary due to changed boundaries. + assert!(data.data.iter().any(Option::is_some)); + } + + Ok(()) + } +} -- 2.39.5 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel