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 160041FF13F for ; Thu, 26 Feb 2026 15:40:20 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 59A3E33D58; Thu, 26 Feb 2026 15:41:18 +0100 (CET) From: Robert Obkircher To: pbs-devel@lists.proxmox.com Subject: [PATCH v1 proxmox-backup 08/11] client: catalog shell: avoid unnecessary block_on in async code Date: Thu, 26 Feb 2026 15:40:22 +0100 Message-ID: <20260226144033.211039-9-r.obkircher@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260226144033.211039-1-r.obkircher@proxmox.com> References: <20260226144033.211039-1-r.obkircher@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1772116855906 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.058 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 Message-ID-Hash: TTJTCZOS6U3OWAVI7Z3FQYGVQI5CZFQ2 X-Message-ID-Hash: TTJTCZOS6U3OWAVI7Z3FQYGVQI5CZFQ2 X-MailFrom: r.obkircher@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: Prefer normal async/await over block_on. The signature of the "pub" new method can be changed because it is implemented on a private type. Signed-off-by: Robert Obkircher --- pbs-client/src/catalog_shell.rs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pbs-client/src/catalog_shell.rs b/pbs-client/src/catalog_shell.rs index 5e1835e4..43f0a73b 100644 --- a/pbs-client/src/catalog_shell.rs +++ b/pbs-client/src/catalog_shell.rs @@ -1080,7 +1080,8 @@ impl Shell { extractor, match_list, &self.accessor, - )?; + ) + .await?; extractor.extract().await } @@ -1119,7 +1120,7 @@ struct ExtractorState<'a> { } impl<'a> ExtractorState<'a> { - pub fn new( + pub async fn new( catalog: &'a mut Option, dir_stack: Vec, extractor: crate::pxar::extract::Extractor, @@ -1132,8 +1133,8 @@ impl<'a> ExtractorState<'a> { .into_iter() } else { let pxar_entry = parent_pxar_entry(&dir_stack)?; - let dir = block_on(pxar_entry.enter_directory())?; - let entries = block_on(crate::pxar::tools::pxar_metadata_read_dir(dir))?; + let dir = pxar_entry.enter_directory().await?; + let entries = crate::pxar::tools::pxar_metadata_read_dir(dir).await?; let mut catalog_entries = Vec::with_capacity(entries.len()); for entry in entries { @@ -1229,7 +1230,7 @@ impl<'a> ExtractorState<'a> { let dir = Shell::walk_pxar_archive(self.accessor, &mut self.dir_stack).await?; self.dir_stack.pop(); let dir = dir.enter_directory().await?; - let entries = block_on(crate::pxar::tools::pxar_metadata_read_dir(dir))?; + let entries = crate::pxar::tools::pxar_metadata_read_dir(dir).await?; entries .into_iter() .map(|entry| { -- 2.47.3