[PATCH proxmox-backup 1/2] group: lock: use group path instead of debug for error message

[PATCH proxmox-backup 1/2] group: lock: use group path instead of debug for error message

[Fabian Grünbichler]

this changes the error from:

  Error: while creating locked backup group 'BackupGroup { store: "store", ns: BackupNamespace { inner: ["namespace"], len: 6 }, group: BackupGroup { ty: Host, id: "group" } }'

to

  Error: while creating locked backup group "/store/pbs/ns/namespace/host/group"'

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 pbs-datastore/src/datastore.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs
index 292c56bff..6fbd18aa0 100644
--- a/pbs-datastore/src/datastore.rs
+++ b/pbs-datastore/src/datastore.rs
@@ -1826,7 +1826,7 @@ impl DataStore {
                 let _ = std::fs::remove_dir(&full_path);
             }
             BackupGroupOpError::Soft(err.context(format!(
-                "while {} locked backup group '{backup_group:?}'",
+                "while {} locked backup group {full_path:?}",
                 if created { "creating new" } else { "creating" },
             )))
         })?;
-- 
2.47.3

[PATCH proxmox-backup 2/2] group: lock: inline error instead of using context

[Fabian Grünbichler]

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 <f.gruenbichler@proxmox.com>
---
 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

applied: [PATCH proxmox-backup 1/2] group: lock: use group path instead of debug for error message

[Thomas Lamprecht]

On Tue, 28 Apr 2026 13:02:47 +0200, Fabian Grünbichler wrote:
> this changes the error from:
> 
>   Error: while creating locked backup group 'BackupGroup { store: "store", ns: BackupNamespace { inner: ["namespace"], len: 6 }, group: BackupGroup { ty: Host, id: "group" } }'
> 
> to
> 
>   Error: while creating locked backup group "/store/pbs/ns/namespace/host/group"'
> 
> [...]

Applied, thanks!

[1/2] group: lock: use group path instead of debug for error message
      commit: ce767a864dcd8c3b0859cf1c2a6f3ccd4bb9ead5
[2/2] group: lock: inline error instead of using context
      commit: 6a6e2d5829c2767e3c07fdef876d52fb14a30e55