From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id 45B411FF150 for ; Tue, 21 Jul 2026 12:38:02 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 2A25A21541; Tue, 21 Jul 2026 12:37:55 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Subject: [PATCH proxmox-backup v3 05/10] datastore: move lock files base path constant to central location Date: Tue, 21 Jul 2026 12:36:38 +0200 Message-ID: <20260721103643.333028-6-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260721103643.333028-1-c.ebner@proxmox.com> References: <20260721103643.333028-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1784630222119 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.236 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_LOW -0.7 Sender listed at https://www.dnswl.org/, low trust 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: C4VLJQEJCJJSAOYIGBFALGIDNG4V2WQP X-Message-ID-Hash: C4VLJQEJCJJSAOYIGBFALGIDNG4V2WQP X-MailFrom: c.ebner@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: 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 --- pbs-datastore/src/backup_info.rs | 3 +-- pbs-datastore/src/chunk_store.rs | 3 +-- pbs-datastore/src/lib.rs | 2 ++ pbs-datastore/src/move_journal.rs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) 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"; #[macro_export] macro_rules! PROXMOX_BACKUP_PROTOCOL_ID_V1 { diff --git a/pbs-datastore/src/move_journal.rs b/pbs-datastore/src/move_journal.rs index a31001541..0dfdbdc2e 100644 --- a/pbs-datastore/src/move_journal.rs +++ b/pbs-datastore/src/move_journal.rs @@ -54,7 +54,7 @@ use proxmox_sys::fs::{CreateOptions, open_file_locked}; use pbs_config::backup_user; -use crate::backup_info::DATASTORE_LOCKS_DIR; +use crate::DATASTORE_LOCKS_DIR; const JOURNAL_FILENAME: &str = "move-journal"; const APPEND_LOCK_TIMEOUT: Duration = Duration::from_secs(10); -- 2.47.3