From: Christian Ebner <c.ebner@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH v2 proxmox-backup 5/5] fix #5853: client: pxar: exclude stale files on metadata/link read
Date: Thu, 14 Nov 2024 15:41:14 +0100 [thread overview]
Message-ID: <20241114144114.375987-6-c.ebner@proxmox.com> (raw)
In-Reply-To: <20241114144114.375987-1-c.ebner@proxmox.com>
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 <c.ebner@proxmox.com>
---
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::<Errno>() {
+ 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
next prev parent reply other threads:[~2024-11-14 14:42 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-14 14:41 [pbs-devel] [PATCH v2 proxmox-backup 0/5] fix #5853: ignore stale files Christian Ebner
2024-11-14 14:41 ` [pbs-devel] [PATCH v2 proxmox-backup 1/5] client: pxar: refactor report vanished/changed helpers Christian Ebner
2024-11-14 14:41 ` [pbs-devel] [PATCH v2 proxmox-backup 2/5] client: pxar: skip directories on stale file handle Christian Ebner
2024-11-14 14:41 ` [pbs-devel] [PATCH v2 proxmox-backup 3/5] client: pxar: skip directory entries " Christian Ebner
2024-11-14 14:41 ` [pbs-devel] [PATCH v2 proxmox-backup 4/5] client: pxar: warn user and ignore stale file handles on file open Christian Ebner
2024-11-14 14:41 ` Christian Ebner [this message]
2024-11-21 12:25 ` [pbs-devel] applied-series: [PATCH v2 proxmox-backup 0/5] fix #5853: ignore stale files Fabian Grünbichler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241114144114.375987-6-c.ebner@proxmox.com \
--to=c.ebner@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox