From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 67B0BC496 for ; Fri, 15 Sep 2023 09:05:03 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3F44D8DCA for ; Fri, 15 Sep 2023 09:04:33 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 15 Sep 2023 09:04:32 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 047014755A for ; Fri, 15 Sep 2023 08:55:06 +0200 (CEST) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Fri, 15 Sep 2023 08:54:43 +0200 Message-Id: <20230915065457.352953-10-h.laimer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230915065457.352953-1-h.laimer@proxmox.com> References: <20230915065457.352953-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.012 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [mod.rs, rawdata.data] Subject: [pbs-devel] [PATCH proxmox-backup 09/23] api2: disks list: add only-unused 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: , X-List-Received-Date: Fri, 15 Sep 2023 07:05:03 -0000 ... 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 | 67 ++++++++++++++++++++++++++++++----- www/form/PartitionSelector.js | 2 +- 3 files changed, 67 insertions(+), 10 deletions(-) diff --git a/src/api2/node/disks/mod.rs b/src/api2/node/disks/mod.rs index 5ee959cd..73cda339 100644 --- a/src/api2/node/disks/mod.rs +++ b/src/api2/node/disks/mod.rs @@ -40,6 +40,12 @@ pub mod zfs; optional: true, default: false, }, + "only-unused": { + description: "Only list partitions not used for removable datastores or mounted directories.", + type: bool, + optional: true, + default: false, + }, "usage-type": { type: DiskUsageType, optional: true, @@ -61,6 +67,7 @@ pub mod zfs; pub fn list_disks( skipsmart: bool, include_partitions: bool, + only_unused: bool, usage_type: Option, ) -> Result, Error> { let mut list = Vec::new(); @@ -68,6 +75,7 @@ pub fn list_disks( for (_, info) in DiskUsageQuery::new() .smart(!skipsmart) .partitions(include_partitions) + .only_not_in_use(only_unused) .query()? { if let Some(ref usage_type) = usage_type { diff --git a/src/tools/disks/mod.rs b/src/tools/disks/mod.rs index 7d52e039..0f1c0e0b 100644 --- a/src/tools/disks/mod.rs +++ b/src/tools/disks/mod.rs @@ -18,6 +18,7 @@ use proxmox_lang::error::io_err_other; use proxmox_lang::{io_bail, io_format_err}; use proxmox_schema::api; use proxmox_sys::linux::procfs::{mountinfo::Device, MountInfo}; +use serde_json::Value; use pbs_api_types::BLOCKDEVICE_NAME_REGEX; @@ -30,6 +31,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! { @@ -770,6 +772,7 @@ fn scan_partitions( pub struct DiskUsageQuery { smart: bool, partitions: bool, + only_not_in_use: bool, } impl DiskUsageQuery { @@ -777,6 +780,7 @@ impl DiskUsageQuery { Self { smart: true, partitions: false, + only_not_in_use: false, } } @@ -790,12 +794,22 @@ impl DiskUsageQuery { self } + pub fn only_not_in_use(&mut self, only_not_in_use: bool) -> &mut Self { + self.only_not_in_use = only_not_in_use; + self + } + pub fn query(&self) -> Result, Error> { - get_disks(None, !self.smart, self.partitions) + get_disks(None, !self.smart, self.partitions, self.only_not_in_use) } 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.only_not_in_use, + )?; if let Some(info) = map.remove(disk) { Ok(info) } else { @@ -804,7 +818,12 @@ 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.only_not_in_use, + ) } } @@ -877,6 +896,8 @@ fn get_disks( no_smart: bool, // include partitions include_partitions: bool, + // skip partitions which are in use + only_not_in_use: bool, ) -> Result, Error> { let disk_manager = DiskManage::new(); @@ -894,6 +915,30 @@ fn get_disks( // fixme: ceph journals/volumes + let uuids_in_use = if only_not_in_use && 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)? @@ -966,12 +1011,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 diff --git a/www/form/PartitionSelector.js b/www/form/PartitionSelector.js index 6246e958..64e7990a 100644 --- a/www/form/PartitionSelector.js +++ b/www/form/PartitionSelector.js @@ -3,7 +3,7 @@ Ext.define('pbs-partition-list', { fields: ['name', 'uuid', 'filesystem', 'devpath', 'size'], proxy: { type: 'proxmox', - url: "/api2/json/nodes/localhost/disks/list?include-partitions=1", + url: "/api2/json/nodes/localhost/disks/list?include-partitions=1&only-unused=1", reader: { transform: (rawData) => rawData.data .flatMap(disk => (disk.partitions ?? []) -- 2.39.2