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 8600E1FF13F for ; Thu, 07 May 2026 10:38:10 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 627ECF60C; Thu, 7 May 2026 10:38:10 +0200 (CEST) Message-ID: <0dc3289a-f214-4d3b-8138-47ff79a61878@proxmox.com> Date: Thu, 7 May 2026 10:38:01 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v1 proxmox-backup 2/3] client: pxar: consistently ignore vanished files and warn about them To: Robert Obkircher , pbs-devel@lists.proxmox.com References: <20260506115016.171006-1-r.obkircher@proxmox.com> <20260506115016.171006-3-r.obkircher@proxmox.com> Content-Language: en-US, de-DE From: Christian Ebner In-Reply-To: <20260506115016.171006-3-r.obkircher@proxmox.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1778142974659 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.069 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 KAM_SHORT 0.001 Use of a URL Shortener for very short URL 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: 4MJBJQS63LKHQ3OF2DN2TLFFFYOKEUCY X-Message-ID-Hash: 4MJBJQS63LKHQ3OF2DN2TLFFFYOKEUCY X-MailFrom: c.ebner@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: Two nits inline, otherwise LGTM. Reviewed-by: Christian Ebner On 5/6/26 1:48 PM, Robert Obkircher wrote: > 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:?}"); nit: should use and slightly adapt the report_vanished_file() helper. > + 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:?}"))) nit: please use with_context() over context() here, since the former is evaluated lazily only once an error does occur [0]. [0] https://docs.rs/anyhow/latest/anyhow/trait.Context.html#required-methods > } > - } > - > - 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;