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 F21671FF390 for ; Fri, 7 Jun 2024 11:42:56 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 80E3B1BF3E; Fri, 7 Jun 2024 11:43:29 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Fri, 7 Jun 2024 11:43:07 +0200 Message-Id: <20240607094313.178742-3-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240607094313.178742-1-c.ebner@proxmox.com> References: <20240607094313.178742-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.028 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH proxmox-backup 2/8] api: datastore: move reusable code out of thread 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" Move code that can be reused when having to perform a lookup via the pxar metadata archive instead of the catalog out of the thread. Signed-off-by: Christian Ebner --- src/api2/admin/datastore.rs | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs index 854302999..117dab080 100644 --- a/src/api2/admin/datastore.rs +++ b/src/api2/admin/datastore.rs @@ -1678,30 +1678,30 @@ pub async fn catalog( ) -> Result, Error> { let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; - tokio::task::spawn_blocking(move || { - let ns = ns.unwrap_or_default(); + let ns = ns.unwrap_or_default(); - let datastore = check_privs_and_load_store( - &store, - &ns, - &auth_id, - PRIV_DATASTORE_READ, - PRIV_DATASTORE_BACKUP, - Some(Operation::Read), - &backup_dir.group, - )?; + let datastore = check_privs_and_load_store( + &store, + &ns, + &auth_id, + PRIV_DATASTORE_READ, + PRIV_DATASTORE_BACKUP, + Some(Operation::Read), + &backup_dir.group, + )?; - let backup_dir = datastore.backup_dir(ns, backup_dir)?; + let backup_dir = datastore.backup_dir(ns, backup_dir)?; - let file_name = CATALOG_NAME; + let file_name = CATALOG_NAME; - let (manifest, files) = read_backup_index(&backup_dir)?; - for file in files { - if file.filename == file_name && file.crypt_mode == Some(CryptMode::Encrypt) { - bail!("cannot decode '{}' - is encrypted", file_name); - } + let (manifest, files) = read_backup_index(&backup_dir)?; + for file in files { + if file.filename == file_name && file.crypt_mode == Some(CryptMode::Encrypt) { + bail!("cannot decode '{file_name}' - is encrypted"); } + } + tokio::task::spawn_blocking(move || { let mut path = datastore.base_path(); path.push(backup_dir.relative_path()); path.push(file_name); -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel