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 368D21FF16B for ; Thu, 14 Nov 2024 15:42:34 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C4E4C32BC0; Thu, 14 Nov 2024 15:42:32 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Thu, 14 Nov 2024 15:41:14 +0100 Message-Id: <20241114144114.375987-6-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241114144114.375987-1-c.ebner@proxmox.com> References: <20241114144114.375987-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.032 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 v2 proxmox-backup 5/5] fix #5853: client: pxar: exclude stale files on metadata/link read 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" Skip and warn the user for files which returned a stale file handle error while reading the metadata associated to that file, or the target in case of a symbolic link. Instead of returning with a hard error, report the stale file handle and skip over encoding this file entry in the pxar archive. Link to issue in bugtracker: https://bugzilla.proxmox.com/show_bug.cgi?id=5853 Link to thread in community forum: https://forum.proxmox.com/threads/156822/ Signed-off-by: Christian Ebner --- changes since version 1: - avoid return value tuples to signal stale file handles downcast anyhow::Error to Errno when check is required - use report_stale_file_handle helper method pbs-client/src/pxar/create.rs | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/pbs-client/src/pxar/create.rs b/pbs-client/src/pxar/create.rs index 3a6e9b157..5d7957970 100644 --- a/pbs-client/src/pxar/create.rs +++ b/pbs-client/src/pxar/create.rs @@ -740,14 +740,23 @@ impl Archiver { None => return Ok(()), }; - let metadata = get_metadata( + let metadata = match get_metadata( fd.as_raw_fd(), stat, self.flags(), self.fs_magic, &mut self.fs_feature_flags, self.skip_e2big_xattr, - )?; + ) { + Ok(metadata) => metadata, + Err(err) => { + if let Some(Errno::ESTALE) = err.downcast_ref::() { + self.report_stale_file_handle(None); + return Ok(()); + } + return Err(err); + } + }; if self.previous_payload_index.is_none() { return self @@ -1294,7 +1303,14 @@ impl Archiver { file_name: &Path, metadata: &Metadata, ) -> Result<(), Error> { - let dest = nix::fcntl::readlinkat(fd.as_raw_fd(), &b""[..])?; + let dest = match nix::fcntl::readlinkat(fd.as_raw_fd(), &b""[..]) { + Ok(dest) => dest, + Err(Errno::ESTALE) => { + self.report_stale_file_handle(None); + return Ok(()); + } + Err(err) => return Err(err.into()), + }; encoder.add_symlink(metadata, file_name, dest).await?; Ok(()) } -- 2.39.5 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel