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 D7CBC1FF146 for ; Tue, 28 Apr 2026 13:03:07 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 89374F008; Tue, 28 Apr 2026 13:03:07 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Subject: [PATCH proxmox-backup 2/2] group: lock: inline error instead of using context Date: Tue, 28 Apr 2026 13:02:48 +0200 Message-ID: <20260428110259.766084-2-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260428110259.766084-1-f.gruenbichler@proxmox.com> References: <20260428110259.766084-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1777374085110 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.054 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [datastore.rs] Message-ID-Hash: PZBDLK5AEZHDDUGWDYHQYY7DXD7HTYJG X-Message-ID-Hash: PZBDLK5AEZHDDUGWDYHQYY7DXD7HTYJG X-MailFrom: f.gruenbichler@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: all the other errors here are constructed like this, and call sites do not log the context yet, so the error is incomplete otherwise.. this changes the error for concurrent group/snapshot creation from: Error: while creating locked backup group "/store/pbs/ns/namespace/host/group"' to: Error: unable to acquire backup group lock "/run/proxmox-backup/locks/store/namespace/host-group" while creating locked backup group "/store/pbs/ns/namespace/host/group" Signed-off-by: Fabian Grünbichler --- pbs-datastore/src/datastore.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs index 6fbd18aa0..a94211f91 100644 --- a/pbs-datastore/src/datastore.rs +++ b/pbs-datastore/src/datastore.rs @@ -1825,10 +1825,10 @@ impl DataStore { if created { let _ = std::fs::remove_dir(&full_path); } - BackupGroupOpError::Soft(err.context(format!( - "while {} locked backup group {full_path:?}", + BackupGroupOpError::Soft(format_err!( + "{err} while {} locked backup group {full_path:?}", if created { "creating new" } else { "creating" }, - ))) + )) })?; if created { -- 2.47.3