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 D00851FF13F for ; Thu, 12 Mar 2026 14:53:39 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8FD7E17AD3; Thu, 12 Mar 2026 14:53:28 +0100 (CET) From: Lukas Wagner To: pdm-devel@lists.proxmox.com Subject: [PATCH proxmox-backup 15/26] metric collection: use blockdev_stat_for_path from proxmox_disks Date: Thu, 12 Mar 2026 14:52:16 +0100 Message-ID: <20260312135229.420729-16-l.wagner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260312135229.420729-1-l.wagner@proxmox.com> References: <20260312135229.420729-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1773323523845 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.047 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 RCVD_IN_MSPIKE_H2 0.001 Average reputation (+2) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: UPS5D2LPBJQJ44ME3P3EZGUVFGEV5YDD X-Message-ID-Hash: UPS5D2LPBJQJ44ME3P3EZGUVFGEV5YDD X-MailFrom: l.wagner@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Datacenter Manager development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: This part of the gather_disk_stats helper has been moved to proxmox_disks directly, so it makes sense to use the moved implementation in PBS as well. Signed-off-by: Lukas Wagner --- src/server/metric_collection/mod.rs | 49 ++++++----------------------- 1 file changed, 10 insertions(+), 39 deletions(-) diff --git a/src/server/metric_collection/mod.rs b/src/server/metric_collection/mod.rs index 3fa6e9fbf..bd197a386 100644 --- a/src/server/metric_collection/mod.rs +++ b/src/server/metric_collection/mod.rs @@ -7,10 +7,11 @@ use std::{ }; use anyhow::Error; +use log::error; use tokio::join; use pbs_api_types::{DataStoreConfig, Operation}; -use proxmox_disks::{zfs_dataset_stats, BlockDevStat, DiskManage}; +use proxmox_disks::{BlockDevStat, DiskManage}; use proxmox_network_api::{get_network_interfaces, IpLink}; use proxmox_sys::{ fs::FileSystemInformation, @@ -221,7 +222,7 @@ fn collect_host_stats_sync() -> HostStats { fn collect_disk_stats_sync() -> (DiskStat, Vec) { let disk_manager = DiskManage::new(); - let root = gather_disk_stats(disk_manager.clone(), Path::new("/"), "host"); + let root = gather_disk_stats(disk_manager.clone(), Path::new("/"), "root".into()); let mut datastores = Vec::new(); match pbs_config::datastore::config() { @@ -245,7 +246,7 @@ fn collect_disk_stats_sync() -> (DiskStat, Vec) { datastores.push(gather_disk_stats( disk_manager.clone(), Path::new(&config.absolute_path()), - &config.name, + config.name.clone(), )); } } @@ -257,7 +258,7 @@ fn collect_disk_stats_sync() -> (DiskStat, Vec) { (root, datastores) } -fn gather_disk_stats(disk_manager: Arc, path: &Path, name: &str) -> DiskStat { +fn gather_disk_stats(disk_manager: Arc, path: &Path, name: String) -> DiskStat { let usage = match proxmox_sys::fs::fs_info(path) { Ok(status) => Some(status), Err(err) => { @@ -266,40 +267,10 @@ fn gather_disk_stats(disk_manager: Arc, path: &Path, name: &str) -> } }; - let dev = match disk_manager.find_mounted_device(path) { - Ok(None) => None, - Ok(Some((fs_type, device, source))) => { - let mut device_stat = None; - match (fs_type.as_str(), source) { - ("zfs", Some(source)) => match source.into_string() { - Ok(dataset) => match zfs_dataset_stats(&dataset) { - Ok(stat) => device_stat = Some(stat), - Err(err) => eprintln!("zfs_dataset_stats({dataset:?}) failed - {err}"), - }, - Err(source) => { - eprintln!("zfs_pool_stats({source:?}) failed - invalid characters") - } - }, - _ => { - if let Ok(disk) = disk_manager.clone().disk_by_dev_num(device.into_dev_t()) { - match disk.read_stat() { - Ok(stat) => device_stat = stat, - Err(err) => eprintln!("disk.read_stat {path:?} failed - {err}"), - } - } - } - } - device_stat - } - Err(err) => { - eprintln!("find_mounted_device failed - {err}"); - None - } - }; + let dev = disk_manager + .blockdev_stat_for_path(path) + .inspect_err(|err| error!("could not read blockdev stats: {err:#}")) + .ok(); - DiskStat { - name: name.to_string(), - usage, - dev, - } + DiskStat { name, usage, dev } } -- 2.47.3