From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id 4F0DC1FF0AB for ; Wed, 09 Sep 2026 14:32:16 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id CD56521614; Wed, 09 Sep 2026 14:32:11 +0200 (CEST) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: Re: [PATCH proxmox-backup 16/28] datastore: conditionally treat missing manifest as error or bening From: Robert Obkircher To: Christian Ebner In-Reply-To: <20260813171002.809441-17-c.ebner@proxmox.com> References: <20260813171002.809441-1-c.ebner@proxmox.com> <20260813171002.809441-17-c.ebner@proxmox.com> Date: Wed, 09 Sep 2026 14:32:04 +0200 Message-Id: <178895712462.166875.486484671746975755.b4-review@b4> X-Mailer: b4 0.16-dev X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1788957117760 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.562 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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: EUGAIQT2TWPQWZ3ABS7IWFLAFPIC7ARX X-Message-ID-Hash: EUGAIQT2TWPQWZ3ABS7IWFLAFPIC7ARX 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 CC: pbs-devel@lists.proxmox.com 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: > A backup snapshot without a manifest is generally a transient state > during ongoing backups. In other cases it must however be treated > as error. > > Therefore, refactor the manifest and blob loading logic to > conditionally allow for missing manifest blob files. By this the > caller is in control whether to treat the missing file as error or > regular operation. > > Signed-off-by: Christian Ebner > > diff --git a/pbs-datastore/src/backup_info.rs b/pbs-datastore/src/backup_info.rs > index be4ec8b3e..f476d4469 100644 > --- a/pbs-datastore/src/backup_info.rs > +++ b/pbs-datastore/src/backup_info.rs > @@ -648,11 +648,26 @@ impl BackupDir { > let mut path = self.full_path(); > path.push(filename); > > - proxmox_lang::try_block!({ > - let mut file = std::fs::File::open(&path)?; > - DataBlob::load_from_reader(&mut file) > - }) > - .map_err(|err| format_err!("unable to load blob '{:?}' - {}", path, err)) > + self.load_blob_conditionally(&path, true) > + .map_err(|err| format_err!("unable to load blob '{path:?}' - {err}"))? > + .ok_or(format_err!("unable to load missing blob '{path:?}'")) The second one is unreachable, because not_found_is_error was true. I think the boolean parameter could just be removed entirely. > + } > + > + /// Load the `DataBlob` from given full path, to be constructed and verified by the caller. > + /// > + /// If the blob file does not exist and `not_found_is_error` is `true`, propagates the error > + /// while otherwise `Ok(None)` is returned. > + fn load_blob_conditionally( > + &self, > + full_path: &Path, > + not_found_is_error: bool, > + ) -> Result, Error> { > + let opt_data_blob = match std::fs::File::open(full_path) { > + Ok(mut file) => Some(DataBlob::load_from_reader(&mut file)?), > + Err(err) if err.kind() == std::io::ErrorKind::NotFound && !not_found_is_error => None, > + Err(err) => return Err(err.into()), > + }; > + Ok(opt_data_blob) > } > > /// Generate the full archive file path with given archive name including server side type > @@ -989,11 +1004,34 @@ impl BackupDir { > } > > /// Load the manifest without a lock. Must not be written back. > + /// > + /// A missing manifest file for the snapshot is treated as error. > pub fn load_manifest(&self) -> Result<(BackupManifest, u64), Error> { > - let blob = self.load_blob(MANIFEST_BLOB_NAME.as_ref())?; > + self.load_manifest_optionally(true)?.ok_or_else(|| { > + format_err!( > + "unable to load missing manifest '{:?}'", > + self.full_path().join(MANIFEST_BLOB_NAME.as_ref()), > + ) Same here. -- Robert Obkircher