From: Robert Obkircher <r.obkircher@proxmox.com>
To: Christian Ebner <c.ebner@proxmox.com>
Cc: pbs-devel@lists.proxmox.com
Subject: Re: [PATCH proxmox-backup v3 04/10] datastore: restrict chunk store scope to pbs-datastore crate
Date: Thu, 23 Jul 2026 13:52:10 +0200 [thread overview]
Message-ID: <178480753020.88450.7667298984460177219.b4-review@b4> (raw)
In-Reply-To: <20260721103643.333028-5-c.ebner@proxmox.com>
> For better organization of the locking related helpers. This constant
> is used in various places for locking, therefore move it to the more
> fitting central crate lib.
>
> No functional changes.
>
> Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
>
> diff --git a/pbs-datastore/src/backup_info.rs b/pbs-datastore/src/backup_info.rs
> index 8abeeb2ea..fbef8e85a 100644
> --- a/pbs-datastore/src/backup_info.rs
> +++ b/pbs-datastore/src/backup_info.rs
> @@ -24,9 +24,8 @@ use crate::datastore::{GROUP_NOTES_FILE_NAME, GROUP_OWNER_FILE_NAME};
> use crate::manifest::{BackupManifest, MANIFEST_LOCK_NAME};
> use crate::move_journal;
> use crate::s3::S3_CONTENT_PREFIX;
> -use crate::{DataBlob, DataStore, DatastoreBackend};
> +use crate::{DATASTORE_LOCKS_DIR, DataBlob, DataStore, DatastoreBackend};
>
> -pub const DATASTORE_LOCKS_DIR: &str = "/run/proxmox-backup/locks";
> pub const PROTECTED_MARKER_FILENAME: &str = ".protected";
>
> proxmox_schema::const_regex! {
> diff --git a/pbs-datastore/src/chunk_store.rs b/pbs-datastore/src/chunk_store.rs
> index d3faf1214..cfd920dea 100644
> --- a/pbs-datastore/src/chunk_store.rs
> +++ b/pbs-datastore/src/chunk_store.rs
> @@ -18,12 +18,11 @@ use proxmox_sys::process_locker::{
> };
> use proxmox_worker_task::WorkerTaskContext;
>
> -use crate::backup_info::DATASTORE_LOCKS_DIR;
> use crate::data_blob::DataChunkBuilder;
> use crate::file_formats::{
> COMPRESSED_BLOB_MAGIC_1_0, ENCRYPTED_BLOB_MAGIC_1_0, UNCOMPRESSED_BLOB_MAGIC_1_0,
> };
> -use crate::{DataBlob, LocalDatastoreLruCache};
> +use crate::{DATASTORE_LOCKS_DIR, DataBlob, LocalDatastoreLruCache};
>
> const USING_MARKER_FILENAME_EXT: &str = "using";
>
> diff --git a/pbs-datastore/src/lib.rs b/pbs-datastore/src/lib.rs
> index f522fadf7..0904d7da2 100644
> --- a/pbs-datastore/src/lib.rs
> +++ b/pbs-datastore/src/lib.rs
> @@ -162,6 +162,8 @@ pub const ACTIVE_OPERATIONS_DIR: &str = concat!(
> pbs_buildcfg::PROXMOX_BACKUP_RUN_DIR_M!(),
> "/active-operations"
> );
> +/// Base path for datastore related file locks.
> +pub const DATASTORE_LOCKS_DIR: &str = "/run/proxmox-backup/locks";
I think this could be limited to pub(crate).
--
Robert Obkircher <r.obkircher@proxmox.com>
next prev parent reply other threads:[~2026-07-23 11:52 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-21 10:36 [PATCH proxmox{,-backup} v3 00/10] keep datastore config unlocked during long running operations Christian Ebner
2026-07-21 10:36 ` [PATCH proxmox v3 01/10] pbs-api-types: add datastore create maintenance-mode type Christian Ebner
2026-07-21 10:36 ` [PATCH proxmox-backup v3 02/10] api: config: rearrange independent code block for datastore creation Christian Ebner
2026-07-21 10:36 ` [PATCH proxmox-backup v3 03/10] api/datastore: refactor datastore creation helper logic Christian Ebner
2026-07-21 10:36 ` [PATCH proxmox-backup v3 04/10] datastore: restrict chunk store scope to pbs-datastore crate Christian Ebner
2026-07-23 11:52 ` Robert Obkircher [this message]
2026-07-21 10:36 ` [PATCH proxmox-backup v3 05/10] datastore: move lock files base path constant to central location Christian Ebner
2026-07-23 11:52 ` Robert Obkircher
2026-07-21 10:36 ` [PATCH proxmox-backup v3 06/10] datastore: move file lock helper to centralized place Christian Ebner
2026-07-21 10:36 ` [PATCH proxmox-backup v3 07/10] datastore: create lockdir with correct mode for backup user access Christian Ebner
2026-07-23 11:52 ` Robert Obkircher
2026-07-21 10:36 ` [PATCH proxmox-backup v3 08/10] api/datastore: use maintenance-mode lock to protect against changes Christian Ebner
2026-07-23 11:52 ` Robert Obkircher
2026-07-21 10:36 ` [PATCH proxmox-backup v3 09/10] api: config: unlocked s3 bucket access check for datastore creation Christian Ebner
2026-07-23 11:52 ` Robert Obkircher
2026-07-23 14:31 ` Christian Ebner
2026-07-21 10:36 ` [PATCH proxmox-backup v3 10/10] datastore: protect datastore creation by maintenance-mode 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=178480753020.88450.7667298984460177219.b4-review@b4 \
--to=r.obkircher@proxmox.com \
--cc=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