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 22FDF1FF399 for ; Wed, 5 Jun 2024 12:54:29 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6BF7031827; Wed, 5 Jun 2024 12:54:59 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Wed, 5 Jun 2024 12:53:48 +0200 Message-Id: <20240605105416.278748-31-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240605105416.278748-1-c.ebner@proxmox.com> References: <20240605105416.278748-1-c.ebner@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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH v9 proxmox-backup 30/58] client: pxar: refactor catalog encoding for directories 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 the catalog directory start and end encoding from `add_entry` to the `add_directory`, the latter being called by the previous. By this, the `add_entry` method can be reused to walk the filesystem tree in the context of an enabled lookahead cache without encoding anything. No functional change intended. Signed-off-by: Christian Ebner --- changes since version 8: - no changes pbs-client/src/pxar/create.rs | 38 +++++++++++++++++------------------ 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/pbs-client/src/pxar/create.rs b/pbs-client/src/pxar/create.rs index 1961b9b54..d126b2777 100644 --- a/pbs-client/src/pxar/create.rs +++ b/pbs-client/src/pxar/create.rs @@ -690,24 +690,15 @@ impl Archiver { } mode::IFDIR => { let dir = Dir::from_fd(fd.into_raw_fd())?; - - if let Some(ref catalog) = self.catalog { - catalog.lock().unwrap().start_directory(c_file_name)?; - } - let result = self - .add_directory( - encoder, - previous_metadata, - dir, - c_file_name, - &metadata, - stat, - ) - .await; - if let Some(ref catalog) = self.catalog { - catalog.lock().unwrap().end_directory()?; - } - result + self.add_directory( + encoder, + previous_metadata, + dir, + c_file_name, + &metadata, + stat, + ) + .await } mode::IFSOCK => { if let Some(ref catalog) = self.catalog { @@ -757,12 +748,15 @@ impl Archiver { encoder: &mut Encoder<'_, T>, previous_metadata_accessor: &mut Option>, dir: Dir, - dir_name: &CStr, + c_dir_name: &CStr, metadata: &Metadata, stat: &FileStat, ) -> Result<(), Error> { - let dir_name = OsStr::from_bytes(dir_name.to_bytes()); + let dir_name = OsStr::from_bytes(c_dir_name.to_bytes()); + if let Some(ref catalog) = self.catalog { + catalog.lock().unwrap().start_directory(c_dir_name)?; + } encoder.create_directory(dir_name, metadata).await?; let old_fs_magic = self.fs_magic; @@ -804,6 +798,10 @@ impl Archiver { self.current_st_dev = old_st_dev; encoder.finish().await?; + if let Some(ref catalog) = self.catalog { + catalog.lock().unwrap().end_directory()?; + } + result } -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel