From: Hannes Laimer <h.laimer@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 09/23] api2: disks list: add only-unused flag
Date: Fri, 15 Sep 2023 08:54:43 +0200 [thread overview]
Message-ID: <20230915065457.352953-10-h.laimer@proxmox.com> (raw)
In-Reply-To: <20230915065457.352953-1-h.laimer@proxmox.com>
... 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 | 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<DiskUsageType>,
) -> Result<Vec<DiskUsageInfo>, 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<HashMap<String, DiskUsageInfo>, 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<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.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<String>) -> Result<HashMap<String, DiskUsageInfo>, 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<HashMap<String, DiskUsageInfo>, 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<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))
+ .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<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
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
next prev parent reply other threads:[~2023-09-15 7:05 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-15 6:54 [pbs-devel] [PATCH proxmox-backup 00/23] add removable datastores Hannes Laimer
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 01/23] tools: add disks utility functions Hannes Laimer
2023-09-19 13:37 ` Lukas Wagner
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 02/23] pbs-api-types: add backing-device to DataStoreConfig Hannes Laimer
2023-09-19 13:37 ` Lukas Wagner
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 03/23] maintenance: add 'Unpplugged' maintenance type Hannes Laimer
2023-09-19 13:37 ` Lukas Wagner
2023-09-21 7:41 ` Hannes Laimer
2023-09-21 8:16 ` Lukas Wagner
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 04/23] disks: add UUID to partition info Hannes Laimer
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 05/23] api2: admin: add (un)mount endpoint for removable datastores Hannes Laimer
2023-09-19 13:38 ` Lukas Wagner
2023-09-21 7:50 ` Hannes Laimer
2023-09-21 8:37 ` Lukas Wagner
2023-09-21 8:41 ` Hannes Laimer
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 06/23] add helper for checking if a removable datastore is available Hannes Laimer
2023-09-19 13:38 ` Lukas Wagner
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 07/23] api2: removable datastore creation Hannes Laimer
2023-09-19 13:38 ` Lukas Wagner
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 08/23] ui: add partition selector form Hannes Laimer
2023-09-15 6:54 ` Hannes Laimer [this message]
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 10/23] ui: add removable datastore creation support Hannes Laimer
2023-09-19 13:38 ` Lukas Wagner
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 11/23] ui: add (un)mount button to summary Hannes Laimer
2023-09-19 13:38 ` Lukas Wagner
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 12/23] pbs-api-types: datastore: use new proxmox_scheme::de for deserialization Hannes Laimer
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 13/23] pbs-api-types: add removable/is-available flag to DataStoreListItem Hannes Laimer
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 14/23] ui: display removable datastores in list Hannes Laimer
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 15/23] ui: utils: render unplugged maintenance mode correctly Hannes Laimer
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 16/23] ui: utils: make parseMaintenanceMode more robust Hannes Laimer
2023-09-19 13:38 ` Lukas Wagner
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 17/23] ui: add datastore status mask for unplugged removable datastores Hannes Laimer
2023-09-19 13:38 ` Lukas Wagner
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 18/23] ui: maintenance: fix disable msg field if no type is selected Hannes Laimer
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 19/23] ui: maintenance: disable edit if unplugged Hannes Laimer
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 20/23] pb-manager: add (un)mount command Hannes Laimer
2023-09-19 13:38 ` Lukas Wagner
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 21/23] add auto-mounting for removable datastores Hannes Laimer
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 22/23] api: mark removable datastores as unplugged after restart Hannes Laimer
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 23/23] datastore: handle deletion of removable datastore properly Hannes Laimer
2023-09-19 13:37 ` [pbs-devel] [PATCH proxmox-backup 00/23] add removable datastores Lukas Wagner
2023-09-19 15:01 ` Thomas Lamprecht
2023-09-19 15:08 ` Lukas Wagner
2023-09-20 10:22 ` Lukas Wagner
2023-09-19 14:03 ` Lukas Wagner
2023-09-19 15:10 ` Lukas Wagner
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=20230915065457.352953-10-h.laimer@proxmox.com \
--to=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