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 1061F1FF2A7 for ; Mon, 27 Oct 2025 11:59:43 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DABCC1FDE; Mon, 27 Oct 2025 12:00:14 +0100 (CET) Date: Mon, 27 Oct 2025 11:59:37 +0100 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox Backup Server development discussion References: <20251016131819.349049-1-c.ebner@proxmox.com> <20251016131819.349049-4-c.ebner@proxmox.com> In-Reply-To: <20251016131819.349049-4-c.ebner@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.17.0 (https://github.com/astroidmail/astroid) Message-Id: <1761561626.qkc079pdtr.astroid@yuna.none> X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1761562769603 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.048 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 Subject: Re: [pbs-devel] [PATCH proxmox-backup 3/6] verify: never hold mutex lock in async scope on corrupt chunk rename 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-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" On October 16, 2025 3:18 pm, Christian Ebner wrote: > Holding a mutex lock across async await boundaries is prone to > deadlock [0]. Renaming a corrupt chunk requires however async API > calls in case of datastores backed by S3. > > Fix this by simply not hold onto the mutex lock guarding the corrupt > chunk list during chunk verification tasks when calling the rename > method. If the chunk is already present in this list, there will be > no other verification task operating on that exact chunk anyways. > > [0] https://docs.rs/tokio/latest/tokio/sync/struct.Mutex.html#which-kind-of-mutex-should-you-use > > Signed-off-by: Christian Ebner please send this one as patch #1, it fixes a bug and is independent from the rest of the cleanup, AFAICT? > --- > src/backup/verify.rs | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/src/backup/verify.rs b/src/backup/verify.rs > index 39f36cd95..b1066f6f5 100644 > --- a/src/backup/verify.rs > +++ b/src/backup/verify.rs > @@ -265,8 +265,7 @@ impl VerifyWorker { > > fn add_corrupt_chunk(&self, digest: [u8; 32], errors: Arc, message: &str) { > // Panic on poisoned mutex > - let mut corrupt_chunks = self.corrupt_chunks.lock().unwrap(); > - corrupt_chunks.insert(digest); > + self.corrupt_chunks.lock().unwrap().insert(digest); > error!(message); > errors.fetch_add(1, Ordering::SeqCst); > match self.datastore.rename_corrupted_chunk(&digest) { > -- > 2.47.3 > > > > _______________________________________________ > pbs-devel mailing list > pbs-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel > > > _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel