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 7F0F41FF13B for ; Wed, 06 May 2026 13:50:40 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7B9341E5D8; Wed, 6 May 2026 13:50:39 +0200 (CEST) From: Robert Obkircher 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 Message-ID: <20260506115016.171006-3-r.obkircher@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260506115016.171006-1-r.obkircher@proxmox.com> References: <20260506115016.171006-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: 1778068124972 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: 6OG7OGN4TOBD7WLZF43XT3UDZIC6KPEV X-Message-ID-Hash: 6OG7OGN4TOBD7WLZF43XT3UDZIC6KPEV 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: 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 --- 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