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 E4F601FF133 for ; Mon, 27 Apr 2026 14:02:48 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C545F1AA27; Mon, 27 Apr 2026 14:02:48 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Subject: [PATCH proxmox-backup 3/4] move namespace: move context log line before check Date: Mon, 27 Apr 2026 14:02:27 +0200 Message-ID: <20260427120234.634681-4-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260427120234.634681-1-f.gruenbichler@proxmox.com> References: <20260427120234.634681-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: 1777291264279 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 Message-ID-Hash: NY3NPEYLIRRK7DQHOELC6C5JQYX5QRUP X-Message-ID-Hash: NY3NPEYLIRRK7DQHOELC6C5JQYX5QRUP 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: to make it clear when the context switches to a particular group, since not all warnings will include its name. Signed-off-by: Fabian Grünbichler --- pbs-datastore/src/backup_info.rs | 2 +- pbs-datastore/src/datastore.rs | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pbs-datastore/src/backup_info.rs b/pbs-datastore/src/backup_info.rs index 8a650b57c..819a3b511 100644 --- a/pbs-datastore/src/backup_info.rs +++ b/pbs-datastore/src/backup_info.rs @@ -321,7 +321,7 @@ impl BackupGroup { info!("oldest source snapshot: {src_oldest_str}"); info!("conflicting target snapshot: {overlap}"); bail!( - "cannot merge group '{}/{}' from '{}' into '{}': snapshot time overlap", + "cannot merge group '{}/{}' from '{}' into '{}': snapshot time mismatch", self.group.ty, self.group.id, self.ns, diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs index 292c56bff..dd5075675 100644 --- a/pbs-datastore/src/datastore.rs +++ b/pbs-datastore/src/datastore.rs @@ -1604,6 +1604,14 @@ impl DataStore { group.group(), ))); } + log::info!( + "{} group '{}/{}' from '{}' to '{target_group_ns}'", + if merge { "merging" } else { "moving" }, + group.group().ty, + group.group().id, + group.backup_ns(), + ); + if merge { group .check_merge_invariants(&target_group) @@ -1620,14 +1628,6 @@ impl DataStore { // the merge invariant (source oldest > target newest) valid on retry. snapshots.sort_by_key(|s| s.backup_time()); - log::info!( - "{} group '{}/{}' from '{}' to '{target_group_ns}'", - if merge { "merging" } else { "moving" }, - group.group().ty, - group.group().id, - group.backup_ns(), - ); - // Each batch is locked, moved, and released before the next to exclude concurrent readers. // `move_to` writes to the per-datastore move journal before each rename so a concurrent // GC phase-1 drain can still mark the moved chunks; see `move_journal` for the race. -- 2.47.3