From: Christian Ebner <c.ebner@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [PATCH proxmox-backup v3 09/15] pbs-datastore: use general helpers for file lock create options
Date: Wed, 1 Jul 2026 16:04:06 +0200 [thread overview]
Message-ID: <20260701140412.200920-10-c.ebner@proxmox.com> (raw)
In-Reply-To: <20260701140412.200920-1-c.ebner@proxmox.com>
Instead of using local implementations, use the helpers provided by
the proxmox-product-config crate for consistency. By this the backup
user lookup is avoided as well, using the globally cached information
instead.
Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
pbs-datastore/src/move_journal.rs | 11 ++---------
pbs-datastore/src/task_tracking.rs | 7 +------
2 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/pbs-datastore/src/move_journal.rs b/pbs-datastore/src/move_journal.rs
index a31001541..a678115d4 100644
--- a/pbs-datastore/src/move_journal.rs
+++ b/pbs-datastore/src/move_journal.rs
@@ -48,11 +48,8 @@ use std::path::{Path, PathBuf};
use std::time::Duration;
use anyhow::{Context, Error, bail, format_err};
-use nix::sys::stat::Mode;
-use proxmox_sys::fs::{CreateOptions, open_file_locked};
-
-use pbs_config::backup_user;
+use proxmox_sys::fs::open_file_locked;
use crate::backup_info::DATASTORE_LOCKS_DIR;
@@ -78,11 +75,7 @@ fn ensure_parent(path: &Path) -> Result<(), Error> {
fn open_locked_exclusive(path: &Path, timeout: Duration) -> Result<File, Error> {
ensure_parent(path)?;
- let user = backup_user()?;
- let options = CreateOptions::new()
- .perm(Mode::from_bits_truncate(0o660))
- .owner(user.uid)
- .group(user.gid);
+ let options = proxmox_product_config::lockfile_create_options();
open_file_locked(path, timeout, true, options)
.with_context(|| format!("failed to acquire exclusive move-journal lock at {path:?}"))
}
diff --git a/pbs-datastore/src/task_tracking.rs b/pbs-datastore/src/task_tracking.rs
index d4cc076aa..3d7bf3e44 100644
--- a/pbs-datastore/src/task_tracking.rs
+++ b/pbs-datastore/src/task_tracking.rs
@@ -35,14 +35,9 @@ struct TaskOperations {
}
fn open_lock_file(name: &str) -> Result<(std::fs::File, CreateOptions), Error> {
- let user = pbs_config::backup_user()?;
-
let lock_path = PathBuf::from(format!("{}/{}.lock", crate::ACTIVE_OPERATIONS_DIR, name));
- let options = CreateOptions::new()
- .group(user.gid)
- .owner(user.uid)
- .perm(nix::sys::stat::Mode::from_bits_truncate(0o660));
+ let options = proxmox_product_config::lockfile_create_options();
let timeout = std::time::Duration::new(10, 0);
--
2.47.3
next prev parent reply other threads:[~2026-07-01 14:05 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-01 14:03 [PATCH proxmox-backup v3 00/15] fix 7642: avoid expensive uid/gid lookups for lock- and config-files Christian Ebner
2026-07-01 14:03 ` [PATCH proxmox-backup v3 01/15] bin: api: early init proxmox-product-config Christian Ebner
2026-07-01 14:03 ` [PATCH proxmox-backup v3 02/15] bin: daily update: refactor to use proxmox-product-config Christian Ebner
2026-07-01 14:04 ` [PATCH proxmox-backup v3 03/15] pbs-config: use proxmox-product-config::replace_secret_config() Christian Ebner
2026-07-01 14:04 ` [PATCH proxmox-backup v3 04/15] pbs-config: use proxmox-product-config::replace_config() Christian Ebner
2026-07-01 14:04 ` [PATCH proxmox-backup v3 05/15] fix #7642: avoid expensive user lookups on file locking Christian Ebner
2026-07-01 14:04 ` [PATCH proxmox-backup v3 06/15] pbs-config: use proxmox-product-config helpers Christian Ebner
2026-07-01 14:04 ` [PATCH proxmox-backup v3 07/15] pbs-config: drop backup_group helper, use users gid instead Christian Ebner
2026-07-01 14:04 ` [PATCH proxmox-backup v3 08/15] pbs-datastore: use proxmox-product-config cached backup user Christian Ebner
2026-07-01 14:04 ` Christian Ebner [this message]
2026-07-01 14:04 ` [PATCH proxmox-backup v3 10/15] server: auth helpers: use proxmox-product-config create options helpers Christian Ebner
2026-07-01 14:04 ` [PATCH proxmox-backup v3 11/15] api: subscription: use proxmox-product-config create options Christian Ebner
2026-07-01 14:04 ` [PATCH proxmox-backup v3 12/15] tape: use proxmox-product-config helper for user lookup Christian Ebner
2026-07-01 14:04 ` [PATCH proxmox-backup v3 13/15] tape: use proxmox-product-config lock file create options Christian Ebner
2026-07-01 14:04 ` [PATCH proxmox-backup v3 14/15] tape: use proxmox-product-config to generate " Christian Ebner
2026-07-01 14:04 ` [PATCH proxmox-backup v3 15/15] tree-wide: use proxmox-product-config::get_api_user for user lookup Christian Ebner
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=20260701140412.200920-10-c.ebner@proxmox.com \
--to=c.ebner@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