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 9F6621FF15F for ; Mon, 7 Oct 2024 11:47:29 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9C4503AED2; Mon, 7 Oct 2024 11:47:54 +0200 (CEST) Date: Mon, 7 Oct 2024 11:47:19 +0200 From: Gabriel Goller To: Proxmox Backup Server development discussion Message-ID: <20241007094719.fp4h3we3ji3c622g@luna.proxmox.com> References: <20240920134035.238237-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20240920134035.238237-1-c.ebner@proxmox.com> User-Agent: NeoMutt/20220429 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.043 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pbs-devel] [PATCH v2 proxmox-backup] fix #5710: api: backup: stat known chunks on backup finish X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Backup Server development discussion Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" >@@ -256,7 +280,23 @@ impl BackupEnvironment { > pub fn lookup_chunk(&self, digest: &[u8; 32]) -> Option { > let state = self.state.lock().unwrap(); > >- state.known_chunks.get(digest).copied() >+ state >+ .known_chunks >+ .get(digest) >+ .map(|known_chunk_info| known_chunk_info.length) >+ } >+ >+ /// stat known chunks from previous backup, so excluding newly uploaded ones >+ pub fn stat_prev_known_chunks(&self) -> Result<(), Error> { >+ let state = self.state.lock().unwrap(); >+ for (digest, known_chunk_info) in &state.known_chunks { >+ if !known_chunk_info.uploaded { >+ self.datastore >+ .stat_chunk(digest) >+ .map_err(|err| format_err!("stat failed on {} - {err}", hex::encode(digest)))?; `err` is an anyhow::Error, so we could add a context, e.g. something like: .map_err(|err| err.context(format!("stat failed on {}", hex::encode(digest))))?; >+ } >+ } >+ Ok(()) > } > > /// Store the writer with an unique ID >diff --git a/src/api2/backup/mod.rs b/src/api2/backup/mod.rs >index ea0d0292e..468824565 100644 >--- a/src/api2/backup/mod.rs >+++ b/src/api2/backup/mod.rs >@@ -785,6 +785,26 @@ fn finish_backup( > ) -> Result { > let env: &BackupEnvironment = rpcenv.as_ref(); > >+ if let Err(err) = env.stat_prev_known_chunks() { >+ env.debug(format!("stat registered chunks failed - {err}")); We want to print the full error, so we need to use `{err:?}`. >+ >+ if let Some(last) = env.last_backup.as_ref() { >+ // No need to acquire snapshot lock, already locked when starting the backup >+ let verify_state = SnapshotVerifyState { >+ state: VerifyState::Failed, >+ upid: env.worker.upid().clone(), // backp writer UPID s/backp/backup/ >+ }; >+ let verify_state = serde_json::to_value(verify_state)?; >+ last.backup_dir >+ .update_manifest(|manifest| { >+ manifest.unprotected["verify_state"] = verify_state; >+ }) >+ .map_err(|err| format_err!("manifest update failed - {err}"))?; Same here, adding anyhow::Context is nicer. >+ } >+ >+ bail!("stat known chunks failed - {err}"); Again, use `{err:?}` instead. >+ } >+ > env.finish_backup()?; > env.log("successfully finished backup"); Also did a quick test which worked perfectly. When the problems above are fixed you can consider: Tested-by: Gabriel Goller Reviewed-by: Gabriel Goller _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel