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 9F9A81FF15C for ; Fri, 3 Oct 2025 10:50:44 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C7BA91EC2F; Fri, 3 Oct 2025 10:50:50 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Fri, 3 Oct 2025 10:50:37 +0200 Message-ID: <20251003085045.1346864-6-d.csapak@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251003085045.1346864-1-d.csapak@proxmox.com> References: <20251003085045.1346864-1-d.csapak@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.027 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 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 4/6] api: admin: datastore: factor out 'get_group_owner' 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" and change the `eprintln` to a `log::warn` Signed-off-by: Dominik Csapak --- src/api2/admin/datastore.rs | 47 +++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs index 26799de6e..0b133d166 100644 --- a/src/api2/admin/datastore.rs +++ b/src/api2/admin/datastore.rs @@ -160,18 +160,8 @@ fn backup_group_to_group_list_item( auth_id: &Authid, list_all: bool, ) -> Option { - let owner = match datastore.get_owner(ns, group.as_ref()) { - Ok(auth_id) => auth_id, - Err(err) => { - eprintln!( - "Failed to get owner of group '{}' in {} - {}", - group.group(), - print_store_and_ns(datastore.name(), ns), - err - ); - return None; - } - }; + let owner = get_group_owner(datastore.name(), ns, &group)?; + if !list_all && check_backup_owner(&owner, auth_id).is_err() { return None; } @@ -439,6 +429,25 @@ pub async fn list_snapshots( .map_err(|err| format_err!("failed to await blocking task: {err}"))? } +fn get_group_owner( + store: &str, + ns: &BackupNamespace, + group: &pbs_datastore::BackupGroup, +) -> Option { + match group.get_owner() { + Ok(auth_id) => Some(auth_id), + Err(err) => { + log::warn!( + "Failed to get owner of group '{}' in {} - {}", + group.group(), + print_store_and_ns(store, ns), + err + ); + None + } + } +} + /// This must not run in a main worker thread as it potentially does tons of I/O. unsafe fn list_snapshots_blocking( store: String, @@ -482,17 +491,9 @@ unsafe fn list_snapshots_blocking( }; groups.iter().try_fold(Vec::new(), |mut snapshots, group| { - let owner = match group.get_owner() { - Ok(auth_id) => auth_id, - Err(err) => { - eprintln!( - "Failed to get owner of group '{}' in {} - {}", - group.group(), - print_store_and_ns(&store, &ns), - err - ); - return Ok(snapshots); - } + let owner = match get_group_owner(&store, &ns, group) { + Some(auth_id) => auth_id, + None => return Ok(snapshots), }; if !list_all && check_backup_owner(&owner, &auth_id).is_err() { -- 2.47.3 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel