From: Hannes Laimer <h.laimer@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup v4 10/22] pbs-api-types: add removable/is-available flag to DataStoreListItem
Date: Tue, 16 Apr 2024 17:24:04 +0200 [thread overview]
Message-ID: <20240416152416.96561-11-h.laimer@proxmox.com> (raw)
In-Reply-To: <20240416152416.96561-1-h.laimer@proxmox.com>
Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
---
pbs-api-types/src/datastore.rs | 9 ++++++++-
src/api2/admin/datastore.rs | 17 +++++++++--------
src/api2/status.rs | 18 +++++++++++++++---
3 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/pbs-api-types/src/datastore.rs b/pbs-api-types/src/datastore.rs
index b5b9784f..73521539 100644
--- a/pbs-api-types/src/datastore.rs
+++ b/pbs-api-types/src/datastore.rs
@@ -380,6 +380,10 @@ impl DataStoreConfig {
pub struct DataStoreListItem {
pub store: String,
pub comment: Option<String>,
+ /// Datastore is removable
+ pub removable: bool,
+ /// Datastore is available
+ pub available: bool,
/// If the datastore is in maintenance mode, information about it
#[serde(skip_serializing_if = "Option::is_none")]
pub maintenance: Option<String>,
@@ -1347,6 +1351,8 @@ pub struct DataStoreStatusListItem {
/// The available bytes of the underlying storage. (-1 on error)
#[serde(skip_serializing_if = "Option::is_none")]
pub avail: Option<u64>,
+ /// The datastore is available, relevant if removable
+ pub is_available: bool,
/// A list of usages of the past (last Month).
#[serde(skip_serializing_if = "Option::is_none")]
pub history: Option<Vec<Option<f64>>>,
@@ -1371,12 +1377,13 @@ pub struct DataStoreStatusListItem {
}
impl DataStoreStatusListItem {
- pub fn empty(store: &str, err: Option<String>) -> Self {
+ pub fn empty(store: &str, err: Option<String>, is_available: bool) -> Self {
DataStoreStatusListItem {
store: store.to_owned(),
total: None,
used: None,
avail: None,
+ is_available,
history: None,
history_start: None,
history_delta: None,
diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs
index 57167a82..46cb75ff 100644
--- a/src/api2/admin/datastore.rs
+++ b/src/api2/admin/datastore.rs
@@ -1261,8 +1261,8 @@ pub fn get_datastore_list(
let mut list = Vec::new();
- for (store, (_, data)) in &config.sections {
- let acl_path = &["datastore", store];
+ for (store, (_, data)) in config.sections {
+ let acl_path = &["datastore", &store];
let user_privs = user_info.lookup_privs(&auth_id, acl_path);
let allowed = (user_privs & (PRIV_DATASTORE_AUDIT | PRIV_DATASTORE_BACKUP)) != 0;
@@ -1273,15 +1273,16 @@ pub fn get_datastore_list(
}
}
+ let store_config: DataStoreConfig = serde_json::from_value(data)?;
+ let is_available = pbs_datastore::is_datastore_available(&store_config);
+
if allowed || allow_id {
list.push(DataStoreListItem {
store: store.clone(),
- comment: if !allowed {
- None
- } else {
- data["comment"].as_str().map(String::from)
- },
- maintenance: data["maintenance-mode"].as_str().map(String::from),
+ comment: if !allowed { None } else { store_config.comment },
+ removable: store_config.backing_device.is_some(),
+ available: is_available,
+ maintenance: store_config.maintenance_mode,
});
}
}
diff --git a/src/api2/status.rs b/src/api2/status.rs
index 78bc06b5..e1d33ccf 100644
--- a/src/api2/status.rs
+++ b/src/api2/status.rs
@@ -13,7 +13,7 @@ use pbs_api_types::{
};
use pbs_config::CachedUserInfo;
-use pbs_datastore::DataStore;
+use pbs_datastore::{is_datastore_available, DataStore};
use crate::rrd_cache::extract_rrd_data;
use crate::tools::statistics::linear_regression;
@@ -48,10 +48,17 @@ pub async fn datastore_status(
for (store, (_, _)) in &config.sections {
let user_privs = user_info.lookup_privs(&auth_id, &["datastore", store]);
let allowed = (user_privs & (PRIV_DATASTORE_AUDIT | PRIV_DATASTORE_BACKUP)) != 0;
+
+ let store_config = config.lookup("datastore", store)?;
+ if !is_datastore_available(&store_config) {
+ list.push(DataStoreStatusListItem::empty(store, None, false));
+ continue;
+ }
+
if !allowed {
if let Ok(datastore) = DataStore::lookup_datastore(store, Some(Operation::Lookup)) {
if can_access_any_namespace(datastore, &auth_id, &user_info) {
- list.push(DataStoreStatusListItem::empty(store, None));
+ list.push(DataStoreStatusListItem::empty(store, None, true));
}
}
continue;
@@ -60,7 +67,11 @@ pub async fn datastore_status(
let datastore = match DataStore::lookup_datastore(store, Some(Operation::Read)) {
Ok(datastore) => datastore,
Err(err) => {
- list.push(DataStoreStatusListItem::empty(store, Some(err.to_string())));
+ list.push(DataStoreStatusListItem::empty(
+ store,
+ Some(err.to_string()),
+ true,
+ ));
continue;
}
};
@@ -71,6 +82,7 @@ pub async fn datastore_status(
total: Some(status.total),
used: Some(status.used),
avail: Some(status.available),
+ is_available: true,
history: None,
history_start: None,
history_delta: None,
--
2.39.2
next prev parent reply other threads:[~2024-04-16 15:24 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-16 15:23 [pbs-devel] [PATCH proxmox-backup v4 00/22] add removable datastores Hannes Laimer
2024-04-16 15:23 ` [pbs-devel] [PATCH proxmox-backup v4 01/22] tools: add disks utility functions Hannes Laimer
2024-04-16 15:23 ` [pbs-devel] [PATCH proxmox-backup v4 02/22] datastore: make dropping from cache more efficient Hannes Laimer
2024-04-17 7:48 ` Christian Ebner
2024-04-17 9:37 ` Dietmar Maurer
2024-04-16 15:23 ` [pbs-devel] [PATCH proxmox-backup v4 03/22] pbs-api-types: add backing-device to DataStoreConfig Hannes Laimer
2024-04-16 15:23 ` [pbs-devel] [PATCH proxmox-backup v4 04/22] disks: add UUID to partition info Hannes Laimer
2024-04-16 15:23 ` [pbs-devel] [PATCH proxmox-backup v4 05/22] add helper for checking if a removable datastore is available Hannes Laimer
2024-04-17 7:56 ` Christian Ebner
2024-04-16 15:24 ` [pbs-devel] [PATCH proxmox-backup v4 06/22] api2: admin: add (un)mount endpoint for removable datastores Hannes Laimer
2024-04-17 8:08 ` Christian Ebner
2024-04-17 9:19 ` Hannes Laimer
2024-04-17 9:26 ` Christian Ebner
2024-04-16 15:24 ` [pbs-devel] [PATCH proxmox-backup v4 07/22] api2: removable datastore creation Hannes Laimer
2024-04-16 15:24 ` [pbs-devel] [PATCH proxmox-backup v4 08/22] api2: disks list: add exclude-used flag Hannes Laimer
2024-04-16 15:24 ` [pbs-devel] [PATCH proxmox-backup v4 09/22] pbs-api-types: datastore: use new proxmox_schema::de for deserialization Hannes Laimer
2024-04-17 8:13 ` Christian Ebner
2024-04-17 9:08 ` Hannes Laimer
2024-04-17 9:38 ` Christian Ebner
2024-04-16 15:24 ` Hannes Laimer [this message]
2024-04-16 15:24 ` [pbs-devel] [PATCH proxmox-backup v4 11/22] pb-manager: add (un)mount command Hannes Laimer
2024-04-17 8:21 ` Christian Ebner
2024-04-16 15:24 ` [pbs-devel] [PATCH proxmox-backup v4 12/22] add auto-mounting for removable datastores Hannes Laimer
2024-04-17 8:29 ` Christian Ebner
2024-04-16 15:24 ` [pbs-devel] [PATCH proxmox-backup v4 13/22] datastore: handle deletion of removable datastore properly Hannes Laimer
2024-04-17 8:34 ` Christian Ebner
2024-04-16 15:24 ` [pbs-devel] [PATCH proxmox-backup v4 14/22] docs: mention maintenance mode reset when removable datastore is unplugged Hannes Laimer
2024-04-17 8:46 ` Hannes Laimer
2024-04-17 8:52 ` Christian Ebner
2024-04-16 15:24 ` [pbs-devel] [PATCH proxmox-backup v4 15/22] ui: add partition selector form Hannes Laimer
2024-04-16 15:24 ` [pbs-devel] [PATCH proxmox-backup v4 16/22] ui: add removable datastore creation support Hannes Laimer
2024-04-16 15:24 ` [pbs-devel] [PATCH proxmox-backup v4 17/22] ui: add (un)mount button to summary Hannes Laimer
2024-04-16 15:24 ` [pbs-devel] [PATCH proxmox-backup v4 18/22] ui: display removable datastores in list Hannes Laimer
2024-04-16 15:24 ` [pbs-devel] [PATCH proxmox-backup v4 19/22] ui: utils: render unplugged datastores correctly Hannes Laimer
2024-04-16 15:24 ` [pbs-devel] [PATCH proxmox-backup v4 20/22] ui: utils: make parseMaintenanceMode more robust Hannes Laimer
2024-04-16 15:24 ` [pbs-devel] [PATCH proxmox-backup v4 21/22] ui: add datastore status mask for unplugged removable datastores Hannes Laimer
2024-04-16 15:24 ` [pbs-devel] [PATCH proxmox-backup v4 22/22] ui: maintenance: fix disable msg field if no type is selected Hannes Laimer
2024-04-17 9:16 ` [pbs-devel] [PATCH proxmox-backup v4 00/22] add removable datastores Christian Ebner
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=20240416152416.96561-11-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