From: Robert Obkircher <r.obkircher@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [PATCH v1 proxmox-backup 2/3] client: pxar: consistently ignore vanished files and warn about them
Date: Wed, 6 May 2026 13:49:25 +0200 [thread overview]
Message-ID: <20260506115016.171006-3-r.obkircher@proxmox.com> (raw)
In-Reply-To: <20260506115016.171006-1-r.obkircher@proxmox.com>
Combine the error paths and treat deleted entries equally in both
cases. Since this used to be a hard error in some cases, it also makes
sense to emit a warning about it.
Signed-off-by: Robert Obkircher <r.obkircher@proxmox.com>
---
pbs-client/src/pxar/create.rs | 32 ++++++++++++--------------------
1 file changed, 12 insertions(+), 20 deletions(-)
diff --git a/pbs-client/src/pxar/create.rs b/pbs-client/src/pxar/create.rs
index 08c5c9b44..47cbf50a8 100644
--- a/pbs-client/src/pxar/create.rs
+++ b/pbs-client/src/pxar/create.rs
@@ -695,36 +695,28 @@ impl Archiver {
})
});
- match match_result {
+ let stat_result = match match_result {
Ok(Some(MatchType::Exclude)) => {
debug!("matched by exclude pattern '{full_path:?}'");
continue;
}
- Ok(_) => (),
- Err(err) if err.not_found() => continue,
+ Ok(_) => stat_result.map_or_else(do_stat, Ok),
+ Err(e) => Err(e),
+ };
+
+ let stat = match stat_result {
+ Ok(stat) => stat,
+ Err(err) if err.not_found() => {
+ warn!("warning: file vanished while reading directory: {full_path:?}");
+ continue;
+ }
Err(Errno::ESTALE) => {
self.report_stale_file_handle(Some(&full_path));
continue;
}
Err(err) => {
- return Err(err).with_context(|| format!("stat failed on {full_path:?}"))
+ return Err(Error::from(err).context(format!("stat failed on {full_path:?}")))
}
- }
-
- let stat = match stat_result {
- Some(stat) => stat,
- None => match do_stat() {
- Ok(stat) => stat,
- Err(Errno::ESTALE) => {
- self.report_stale_file_handle(Some(&full_path));
- continue;
- }
- Err(err) => {
- return Err(
- Error::from(err).context(format!("stat failed on {full_path:?}"))
- )
- }
- },
};
self.entry_counter += 1;
--
2.47.3
next prev parent reply other threads:[~2026-05-06 11:50 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-06 11:49 [PATCH v1 proxmox-backup 0/3] improve fstatat error handling Robert Obkircher
2026-05-06 11:49 ` [PATCH v1 proxmox-backup 1/3] client: pxar: improve variable names Robert Obkircher
2026-05-07 8:38 ` Christian Ebner
2026-05-06 11:49 ` Robert Obkircher [this message]
2026-05-07 8:38 ` [PATCH v1 proxmox-backup 2/3] client: pxar: consistently ignore vanished files and warn about them Christian Ebner
2026-05-07 15:50 ` Robert Obkircher
2026-05-08 9:38 ` Christian Ebner
2026-05-08 11:40 ` Robert Obkircher
2026-05-08 13:26 ` Christian Ebner
2026-05-08 14:03 ` Robert Obkircher
2026-05-08 14:12 ` Christian Ebner
2026-05-06 11:49 ` [PATCH v1 proxmox-backup 3/3] client: pxar: skip files on fstatat permission errors Robert Obkircher
2026-05-07 8:42 ` Christian Ebner
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=20260506115016.171006-3-r.obkircher@proxmox.com \
--to=r.obkircher@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