From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
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 [thread overview]
Message-ID: <20260427120234.634681-4-f.gruenbichler@proxmox.com> (raw)
In-Reply-To: <20260427120234.634681-1-f.gruenbichler@proxmox.com>
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 <f.gruenbichler@proxmox.com>
---
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
next prev parent reply other threads:[~2026-04-27 12:02 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-27 12:02 [PATCH proxmox-backup 0/4] move group/namespace logging improvements Fabian Grünbichler
2026-04-27 12:02 ` [PATCH proxmox-backup 1/4] move group: use human-readable snapshot timestamp in check Fabian Grünbichler
2026-04-27 12:02 ` [PATCH proxmox-backup 2/4] move group: split overly long error message Fabian Grünbichler
2026-04-27 12:02 ` Fabian Grünbichler [this message]
2026-04-27 12:02 ` [PATCH proxmox-backup 4/4] move namespace: use group(s)/namespace(s) consistently Fabian Grünbichler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260427120234.634681-4-f.gruenbichler@proxmox.com \
--to=f.gruenbichler@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox