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 4AF621FF380 for ; Fri, 19 Apr 2024 17:56:46 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B39CFE503; Fri, 19 Apr 2024 17:56:48 +0200 (CEST) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Fri, 19 Apr 2024 17:55:50 +0200 Message-Id: <20240419155606.112010-8-h.laimer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240419155606.112010-1-h.laimer@proxmox.com> References: <20240419155606.112010-1-h.laimer@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.004 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: [pbs-devel] [PATCH proxmox-backup v8 07/23] api: disks list: add exclude-used flag X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" ... used by the partition selector for removable datastore creation. Signed-off-by: Hannes Laimer --- src/api2/node/disks/mod.rs | 8 +++++ src/tools/disks/mod.rs | 62 ++++++++++++++++++++++++++++++++------ 2 files changed, 61 insertions(+), 9 deletions(-) diff --git a/src/api2/node/disks/mod.rs b/src/api2/node/disks/mod.rs index 711dae7b..f63bbd9b 100644 --- a/src/api2/node/disks/mod.rs +++ b/src/api2/node/disks/mod.rs @@ -41,6 +41,12 @@ pub mod zfs; optional: true, default: false, }, + "exclude-used": { + description: "Exclude partitions already used for removable datastores or mounted directories.", + type: bool, + optional: true, + default: false, + }, "usage-type": { type: DiskUsageType, optional: true, @@ -62,6 +68,7 @@ pub mod zfs; pub fn list_disks( skipsmart: bool, include_partitions: bool, + exclude_used: bool, usage_type: Option, ) -> Result, Error> { let mut list = Vec::new(); @@ -69,6 +76,7 @@ pub fn list_disks( for (_, info) in DiskUsageQuery::new() .smart(!skipsmart) .partitions(include_partitions) + .exclude_used(exclude_used) .query()? { if let Some(ref usage_type) = usage_type { diff --git a/src/tools/disks/mod.rs b/src/tools/disks/mod.rs index 6227948d..ee11f500 100644 --- a/src/tools/disks/mod.rs +++ b/src/tools/disks/mod.rs @@ -20,6 +20,7 @@ use proxmox_rest_server::WorkerTask; use proxmox_schema::api; use proxmox_sys::linux::procfs::{mountinfo::Device, MountInfo}; use proxmox_sys::task_log; +use serde_json::Value; use pbs_api_types::{BLOCKDEVICE_DISK_AND_PARTITION_NAME_REGEX, BLOCKDEVICE_NAME_REGEX}; @@ -32,6 +33,7 @@ pub use zpool_list::*; mod lvm; pub use lvm::*; mod smart; +use crate::api2::node::disks::directory::list_datastore_mounts; pub use smart::*; lazy_static::lazy_static! { @@ -828,6 +830,7 @@ fn scan_partitions( pub struct DiskUsageQuery { smart: bool, partitions: bool, + exclude_used: bool, } impl DiskUsageQuery { @@ -835,6 +838,7 @@ impl DiskUsageQuery { Self { smart: true, partitions: false, + exclude_used: false, } } @@ -848,12 +852,22 @@ impl DiskUsageQuery { self } + pub fn exclude_used(&mut self, exclude_used: bool) -> &mut Self { + self.exclude_used = exclude_used; + self + } + pub fn query(&self) -> Result, Error> { - get_disks(None, !self.smart, self.partitions) + get_disks(None, !self.smart, self.partitions, self.exclude_used) } pub fn find(&self, disk: &str) -> Result { - let mut map = get_disks(Some(vec![disk.to_string()]), !self.smart, self.partitions)?; + let mut map = get_disks( + Some(vec![disk.to_string()]), + !self.smart, + self.partitions, + self.exclude_used, + )?; if let Some(info) = map.remove(disk) { Ok(info) } else { @@ -862,7 +876,7 @@ impl DiskUsageQuery { } pub fn find_all(&self, disks: Vec) -> Result, Error> { - get_disks(Some(disks), !self.smart, self.partitions) + get_disks(Some(disks), !self.smart, self.partitions, self.exclude_used) } } @@ -935,6 +949,8 @@ fn get_disks( no_smart: bool, // include partitions include_partitions: bool, + // skip partitions which are in use + exclude_used: bool, ) -> Result, Error> { let disk_manager = DiskManage::new(); @@ -952,6 +968,30 @@ fn get_disks( // fixme: ceph journals/volumes + let uuids_in_use = if exclude_used && include_partitions { + let (config, _digest) = pbs_config::datastore::config()?; + + let uuids_from_datastores: Vec = config + .sections + .iter() + .filter_map(|(_, (_, data))| { + data.as_object() + .and_then(|cfg| cfg.get("backing-device")) + .and_then(Value::as_str) + .map(String::from) + }) + .collect(); + + let uuids_from_mounts: Vec = list_datastore_mounts()? + .into_iter() + .filter_map(|mount| mount.device.split('/').last().map(String::from)) + .collect(); + + [&uuids_from_datastores[..], &uuids_from_mounts[..]].concat() + } else { + Vec::new() + }; + let mut result = HashMap::new(); for item in proxmox_sys::fs::scan_subdir(libc::AT_FDCWD, "/sys/block", &BLOCKDEVICE_NAME_REGEX)? @@ -1024,12 +1064,16 @@ fn get_disks( let partitions: Option> = if include_partitions { disk.partitions().map_or(None, |parts| { - Some(get_partitions_info( - parts, - &lvm_devices, - &zfs_devices, - &file_system_devices, - )) + let infos = + get_partitions_info(parts, &lvm_devices, &zfs_devices, &file_system_devices) + .into_iter() + .filter(|part| { + part.uuid + .as_ref() + .map_or(true, |u| !uuids_in_use.contains(u)) + }) + .collect(); + Some(infos) }) } else { None -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel