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 9B1951FF15C for ; Wed, 13 Nov 2024 16:01:50 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 748D818B32; Wed, 13 Nov 2024 16:01:49 +0100 (CET) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Wed, 13 Nov 2024 16:00:45 +0100 Message-Id: <20241113150102.164820-10-h.laimer@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241113150102.164820-1-h.laimer@proxmox.com> References: <20241113150102.164820-1-h.laimer@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -1.279 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 ENA_SUBJ_ODD_CASE 2.6 Subject has odd case 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 v13 09/26] pbs-api-types: add mount_status field to DataStoreListItem 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" Only removable datastores have a mount status, so normal ones will have `None`, and for removable ones it is either mounted (`Some(true)`) or not mounted (`Some(false)`). Signed-off-by: Hannes Laimer --- changes since v12: * replace is_availabl+removable field combo, with single mount_status field pbs-api-types/src/datastore.rs | 9 ++++++++- src/api2/admin/datastore.rs | 22 ++++++++++++++-------- src/api2/status/mod.rs | 29 +++++++++++++++++++++++++---- 3 files changed, 47 insertions(+), 13 deletions(-) diff --git a/pbs-api-types/src/datastore.rs b/pbs-api-types/src/datastore.rs index 888f5d5b..e111d692 100644 --- a/pbs-api-types/src/datastore.rs +++ b/pbs-api-types/src/datastore.rs @@ -454,6 +454,9 @@ impl DataStoreConfig { pub struct DataStoreListItem { pub store: String, pub comment: Option, + /// Is datastore mounted, None for not-removable datastores + #[serde(skip_serializing_if = "Option::is_none")] + pub mount_status: Option, /// If the datastore is in maintenance mode, information about it #[serde(skip_serializing_if = "Option::is_none")] pub maintenance: Option, @@ -1453,6 +1456,9 @@ pub struct DataStoreStatusListItem { /// The available bytes of the underlying storage. (-1 on error) #[serde(skip_serializing_if = "Option::is_none")] pub avail: Option, + /// The datastore is mounted, None for not-removable datastores + #[serde(skip_serializing_if = "Option::is_none")] + pub mount_status: Option, /// A list of usages of the past (last Month). #[serde(skip_serializing_if = "Option::is_none")] pub history: Option>>, @@ -1477,12 +1483,13 @@ pub struct DataStoreStatusListItem { } impl DataStoreStatusListItem { - pub fn empty(store: &str, err: Option) -> Self { + pub fn empty(store: &str, err: Option, mount_status: Option) -> Self { DataStoreStatusListItem { store: store.to_owned(), total: None, used: None, avail: None, + mount_status, history: None, history_start: None, history_delta: None, diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs index a12262e7..a9d9040f 100644 --- a/src/api2/admin/datastore.rs +++ b/src/api2/admin/datastore.rs @@ -1310,8 +1310,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; @@ -1322,15 +1322,21 @@ pub fn get_datastore_list( } } + let store_config: DataStoreConfig = serde_json::from_value(data)?; + + let mount_status = store_config + .get_mount_point() + .zip(store_config.backing_device.as_ref()) + .map(|(mount_point, device_uuid)| { + is_datastore_mounted_at(mount_point, device_uuid.to_string()) + }); + 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: store_config.comment.filter(|_| allowed), + mount_status, + maintenance: store_config.maintenance_mode, }); } } diff --git a/src/api2/status/mod.rs b/src/api2/status/mod.rs index 113aa985..508331fe 100644 --- a/src/api2/status/mod.rs +++ b/src/api2/status/mod.rs @@ -10,11 +10,12 @@ use proxmox_schema::api; use proxmox_sortable_macro::sortable; use pbs_api_types::{ - Authid, DataStoreStatusListItem, Operation, PRIV_DATASTORE_AUDIT, PRIV_DATASTORE_BACKUP, + Authid, DataStoreConfig, DataStoreStatusListItem, Operation, PRIV_DATASTORE_AUDIT, + PRIV_DATASTORE_BACKUP, }; use pbs_config::CachedUserInfo; -use pbs_datastore::DataStore; +use pbs_datastore::{is_datastore_mounted_at, DataStore}; use crate::server::metric_collection::rrd::extract_rrd_data; use crate::tools::statistics::linear_regression; @@ -51,10 +52,25 @@ 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)?; + + let mount_status = store_config + .get_mount_point() + .zip(store_config.backing_device.as_ref()) + .map(|(mount_point, device_uuid)| { + is_datastore_mounted_at(mount_point, device_uuid.to_string()) + }); + + if let Some(false) = mount_status { + list.push(DataStoreStatusListItem::empty(store, None, mount_status)); + 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, mount_status)); } } continue; @@ -63,7 +79,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()), + mount_status, + )); continue; } }; @@ -74,6 +94,7 @@ pub async fn datastore_status( total: Some(status.total), used: Some(status.used), avail: Some(status.available), + mount_status, history: None, history_start: None, history_delta: None, -- 2.39.5 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel