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 664921FF165 for ; Thu, 31 Jul 2025 09:38:57 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1DD8834493; Thu, 31 Jul 2025 09:40:23 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Thu, 31 Jul 2025 09:39:47 +0200 Message-ID: <20250731073950.73526-3-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250731073950.73526-1-c.ebner@proxmox.com> References: <20250731073950.73526-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1753947607556 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.043 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.001 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.001 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.001 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 Subject: [pbs-devel] [PATCH proxmox-backup 1/4] api: status: expose backend type in datastore status list item 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" Analogous to the mount status, include the backend type in the datastore status list item. This allows to interpret the provided data based on the backend type. Signed-off-by: Christian Ebner --- src/api2/status/mod.rs | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/api2/status/mod.rs b/src/api2/status/mod.rs index e066a99c7..6f0b2cf8c 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, + DatastoreBackendType, 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.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel