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 89D551FF13F for ; Thu, 12 Mar 2026 14:52:53 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id ADB491700B; Thu, 12 Mar 2026 14:52:44 +0100 (CET) From: Lukas Wagner To: pdm-devel@lists.proxmox.com Subject: [PATCH proxmox 08/26] disks: add parts of gather_disk_stats from PBS Date: Thu, 12 Mar 2026 14:52:09 +0100 Message-ID: <20260312135229.420729-9-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: 1773323522766 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: JRDJPI6J5JOGDUY4PKGQ2YQULEMHTW2E X-Message-ID-Hash: JRDJPI6J5JOGDUY4PKGQ2YQULEMHTW2E 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: Move one part of the `gather_disk_stats` function from PBS to proxmox-disks as a new method of the `DiskManage` type. We need this in both, PBS and PDM and structure and behavior indicated that should rather be a method on this type. The code has been refactored a bit to make it more readable. Signed-off-by: Lukas Wagner --- proxmox-disks/src/lib.rs | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/proxmox-disks/src/lib.rs b/proxmox-disks/src/lib.rs index d672854a..4039b4cd 100644 --- a/proxmox-disks/src/lib.rs +++ b/proxmox-disks/src/lib.rs @@ -189,6 +189,43 @@ impl DiskManage { pub fn is_devnum_mounted(&self, dev: dev_t) -> Result { self.mounted_devices().map(|mounted| mounted.contains(&dev)) } + + /// Query [`BlockDevStat`] for a given path. + pub fn blockdev_stat_for_path>( + self: Arc, + path: P, + ) -> Result { + let (fs_type, device, mount_source) = self + .find_mounted_device(path.as_ref()) + .context("find_mounted_device failed")? + .ok_or_else(|| { + format_err!( + "could not determine mounted device for path {}", + path.as_ref().display() + ) + })?; + + if let Some(source) = mount_source + && fs_type == "zfs" + { + let dataset = source.into_string().map_err(|s| { + format_err!("could not convert {s:?} to string - invalid characters") + })?; + + zfs_dataset_stats(&dataset) + } else { + let disk = self + .clone() + .disk_by_dev_num(device.into_dev_t()) + .context("could not look up disk by device num")?; + + disk.read_stat() + .with_context(|| format!("could not read stats for {}", path.as_ref().display()))? + .ok_or_else(|| { + format_err!("could not read disk stats for {}", path.as_ref().display()) + }) + } + } } /// Queries (and caches) various information about a specific disk. -- 2.47.3