From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id C93851FF0B7 for ; Fri, 13 Nov 2026 15:22:12 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 64F2D216D1; Fri, 13 Nov 2026 15:21:57 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Subject: [PATCH proxmox-backup v4 09/11] datastore: snapshot: propagate errors in manifest update callback Date: Fri, 13 Nov 2026 15:21:46 +0100 Message-ID: <20261113142148.569471-10-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261113142148.569471-1-c.ebner@proxmox.com> References: <20261113142148.569471-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1794579713884 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.394 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: EYNBKFA2SOD3SUN4IDS2E74WCWXZ2YD5 X-Message-ID-Hash: EYNBKFA2SOD3SUN4IDS2E74WCWXZ2YD5 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: Allow propagating potential errors from the manifest update callback to the caller. In preparation for propagating verify state encoding errors. Signed-off-by: Christian Ebner --- pbs-datastore/src/backup_info.rs | 4 ++-- pbs-datastore/src/datastore.rs | 1 + src/backup/verify.rs | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pbs-datastore/src/backup_info.rs b/pbs-datastore/src/backup_info.rs index cce2b699f..9c136fd3c 100644 --- a/pbs-datastore/src/backup_info.rs +++ b/pbs-datastore/src/backup_info.rs @@ -1001,12 +1001,12 @@ impl BackupDir { pub fn update_manifest( &self, backend: &DatastoreBackend, - update_fn: impl FnOnce(&mut BackupManifest), + update_fn: impl FnOnce(&mut BackupManifest) -> Result<(), Error>, ) -> Result<(), Error> { let _guard = self.lock_manifest()?; let (mut manifest, _) = self.load_manifest()?; - update_fn(&mut manifest); + update_fn(&mut manifest)?; // keep existing signature let blob = manifest.to_data_blob(None)?; diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs index d62b21f9e..d34715b4b 100644 --- a/pbs-datastore/src/datastore.rs +++ b/pbs-datastore/src/datastore.rs @@ -3447,6 +3447,7 @@ impl DataStore { snapshot .update_manifest(&backend, |manifest| { manifest.unprotected["notes"] = notes.into(); + Ok(()) }) .map_err(|err| format_err!("unable to update manifest blob - {err}"))?; Ok(()) diff --git a/src/backup/verify.rs b/src/backup/verify.rs index 01aafb4f2..d2325ce9a 100644 --- a/src/backup/verify.rs +++ b/src/backup/verify.rs @@ -457,6 +457,7 @@ impl VerifyWorker { let verify_state = serde_json::to_value(verify_state)?; backup_dir.update_manifest(&self.datastore.backend()?, |manifest| { manifest.unprotected["verify_state"] = verify_state; + Ok(()) }) } { info!("verify {datastore_name}:{backup_dir_name} - manifest update error: {err}"); -- 2.47.3