From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 0FCA21FF13B for ; Wed, 11 Mar 2026 13:05:52 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8A04A18BCD; Wed, 11 Mar 2026 13:05:46 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Subject: [PATCH proxmox-backup v2 2/3] api: status/datastore: expose backend type in datastore status/list Date: Wed, 11 Mar 2026 13:05:00 +0100 Message-ID: <20260311120501.536269-4-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260311120501.536269-1-c.ebner@proxmox.com> References: <20260311120501.536269-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1773230677983 X-SPAM-LEVEL: Spam detection results: 0 AWL -1.008 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.408 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.819 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.903 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: BIWMDRKKALBQY2DT6T5EWQEHMUXFX6MD X-Message-ID-Hash: BIWMDRKKALBQY2DT6T5EWQEHMUXFX6MD X-MailFrom: c.ebner@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Backup Server development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Analogous to the mount status, include the backend type in the datastore status list item and datastore status. This allows to interpret the provided data based on the backend type and therefore to switch elements on the ui such as labels. Signed-off-by: Christian Ebner --- src/api2/admin/datastore.rs | 4 ++++ src/api2/status/mod.rs | 18 +++++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs index 88ad5d53b..c1fd85a1e 100644 --- a/src/api2/admin/datastore.rs +++ b/src/api2/admin/datastore.rs @@ -622,6 +622,8 @@ pub async fn status( (None, None) }; + let backend_type = datastore.backend_type(); + Ok(if store_stats { let storage = crate::tools::fs::fs_info(datastore.base_path()).await?; DataStoreStatus { @@ -630,6 +632,7 @@ pub async fn status( avail: storage.available, gc_status, counts, + backend_type, } } else { DataStoreStatus { @@ -638,6 +641,7 @@ pub async fn status( avail: 0, gc_status, counts, + backend_type, } }) } diff --git a/src/api2/status/mod.rs b/src/api2/status/mod.rs index 605072d60..61f0bc912 100644 --- a/src/api2/status/mod.rs +++ b/src/api2/status/mod.rs @@ -10,8 +10,8 @@ use proxmox_schema::api; use proxmox_sortable_macro::sortable; use pbs_api_types::{ - Authid, DataStoreConfig, DataStoreMountStatus, DataStoreStatusListItem, Operation, - PRIV_DATASTORE_AUDIT, PRIV_DATASTORE_BACKUP, + Authid, DataStoreConfig, DataStoreMountStatus, DataStoreStatusListItem, DatastoreBackendConfig, + Operation, PRIV_DATASTORE_AUDIT, PRIV_DATASTORE_BACKUP, }; use pbs_config::CachedUserInfo; @@ -55,6 +55,10 @@ pub async fn datastore_status( let store_config = config.lookup::("datastore", store)?; + let backend_config: DatastoreBackendConfig = + store_config.backend.as_deref().unwrap_or("").parse()?; + let backend_type = backend_config.ty.unwrap_or_default(); + let mount_status = match get_datastore_mount_status(&store_config) { Some(true) => DataStoreMountStatus::Mounted, Some(false) => { @@ -62,6 +66,7 @@ pub async fn datastore_status( store, None, DataStoreMountStatus::NotMounted, + backend_type, )); continue; } @@ -71,7 +76,12 @@ pub async fn datastore_status( 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, mount_status)); + list.push(DataStoreStatusListItem::empty( + store, + None, + mount_status, + backend_type, + )); } } continue; @@ -84,6 +94,7 @@ pub async fn datastore_status( store, Some(err.to_string()), mount_status, + backend_type, )); continue; } @@ -102,6 +113,7 @@ pub async fn datastore_status( estimated_full_date: None, error: None, gc_status: Some(datastore.last_gc_status()), + backend_type, }; let rrd_dir = format!("datastore/{store}"); -- 2.47.3