From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: Hannes Laimer <h.laimer@proxmox.com>
Cc: pbs-devel@lists.proxmox.com
Subject: Re: [pbs-devel] [PATCH proxmox-backup v9 09/26] api: disks list: add exclude-used flag
Date: Wed, 24 Apr 2024 15:09:42 +0200 [thread overview]
Message-ID: <aohwdgu6ev2yjvsbharsw65nwto36etq72trv5pp4imaf25r4z@j2zh5pwt3qeu> (raw)
In-Reply-To: <20240423083000.28002-10-h.laimer@proxmox.com>
On Tue, Apr 23, 2024 at 10:29:43AM +0200, Hannes Laimer wrote:
> ... used by the partition selector for removable datastore creation.
>
> Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
> ---
> 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<DiskUsageType>,
> ) -> Result<Vec<DiskUsageInfo>, 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<HashMap<String, DiskUsageInfo>, 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<DiskUsageInfo, Error> {
> - 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<String>) -> Result<HashMap<String, DiskUsageInfo>, 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<HashMap<String, DiskUsageInfo>, 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<String> = 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<String> = list_datastore_mounts()?
> + .into_iter()
> + .filter_map(|mount| mount.device.split('/').last().map(String::from))
^ I'm not a fan of doing this here.
IMO we should include a uuid property in the type returned by
`list_datastore_mounts()` instead because this looks just too hacky IMO.
> + .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<Vec<PartitionInfo>> = 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
next prev parent reply other threads:[~2024-04-24 13:10 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-23 8:29 [pbs-devel] [PATCH proxmox-backup v9 00/26] add removable datastores Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 01/26] tools: add disks utility functions Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 02/26] config: factor out method to get the absolute datastore path Hannes Laimer
2024-04-24 13:26 ` Wolfgang Bumiller
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 03/26] pbs-api-types: add backing-device to DataStoreConfig Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 04/26] maintenance: add 'Unmount' maintenance type Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 05/26] disks: add UUID to partition info Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 06/26] datastore: add helper for checking if a removable datastore is available Hannes Laimer
2024-04-24 11:16 ` Gabriel Goller
2024-04-24 13:30 ` Wolfgang Bumiller
2024-04-25 6:05 ` Hannes Laimer
2024-04-25 7:19 ` Wolfgang Bumiller
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 07/26] api: admin: add (un)mount endpoint for removable datastores Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 08/26] api: removable datastore creation Hannes Laimer
2024-04-24 13:04 ` Wolfgang Bumiller
2024-04-25 8:52 ` Wolfgang Bumiller
2024-04-25 8:58 ` Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 09/26] api: disks list: add exclude-used flag Hannes Laimer
2024-04-24 13:09 ` Wolfgang Bumiller [this message]
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 10/26] pbs-api-types: add removable/is-available flag to DataStoreListItem Hannes Laimer
2024-04-24 13:13 ` Wolfgang Bumiller
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 11/26] bin: manager: add (un)mount command Hannes Laimer
2024-04-24 11:25 ` Gabriel Goller
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 12/26] add auto-mounting for removable datastores Hannes Laimer
2024-04-24 13:18 ` Wolfgang Bumiller
2024-04-25 5:32 ` Hannes Laimer
2024-04-25 5:34 ` Hannes Laimer
2024-04-24 13:35 ` Wolfgang Bumiller
2024-04-25 4:59 ` Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 13/26] datastore: handle deletion of removable datastore properly Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 14/26] docs: add removable datastores section Hannes Laimer
2024-04-24 11:53 ` Gabriel Goller
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 15/26] ui: add partition selector form Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 16/26] ui: add removable datastore creation support Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 17/26] ui: add (un)mount button to summary Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 18/26] ui: tree: render unmounted datastores correctly Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 19/26] ui: utils: make parseMaintenanceMode more robust Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 20/26] ui: add datastore status mask for unmounted removable datastores Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 21/26] ui: maintenance: fix disable msg field if no type is selected Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 22/26] ui: render 'unmount' maintenance mode correctly Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 23/26] api: node: allow creation of removable datastore through directory endpoint Hannes Laimer
2024-04-24 11:56 ` Gabriel Goller
2024-04-24 13:21 ` Wolfgang Bumiller
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 24/26] api: node: include removable datastores in directory list Hannes Laimer
2024-04-24 13:06 ` Wolfgang Bumiller
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 25/26] node: disks: replace BASE_MOUNT_DIR with DATASTORE_MOUNT_DIR Hannes Laimer
2024-04-23 8:30 ` [pbs-devel] [PATCH proxmox-backup v9 26/26] ui: support create removable datastore through directory creation Hannes Laimer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=aohwdgu6ev2yjvsbharsw65nwto36etq72trv5pp4imaf25r4z@j2zh5pwt3qeu \
--to=w.bumiller@proxmox.com \
--cc=h.laimer@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox