From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 283BE1FF141 for ; Tue, 05 May 2026 10:12:13 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1E8A61993B; Tue, 5 May 2026 10:12:08 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Subject: [PATCH proxmox-backup 2/4] datastore: move lock files base path constant to central location Date: Tue, 5 May 2026 10:11:34 +0200 Message-ID: <20260505081137.227901-3-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260505081137.227901-1-c.ebner@proxmox.com> References: <20260505081137.227901-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: 1777968613682 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.070 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [lib.rs] Message-ID-Hash: 6FTJRGMJ2S5TXGPVXB35F753XOA3GC5I X-Message-ID-Hash: 6FTJRGMJ2S5TXGPVXB35F753XOA3GC5I 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 223a8cbd4..9919b908a 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::{DataBlob, DataStore, DatastoreBackend, DATASTORE_LOCKS_DIR}; -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 68db88eab..5b07ebdaa 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::{DataBlob, LocalDatastoreLruCache, DATASTORE_LOCKS_DIR}; const USING_MARKER_FILENAME_EXT: &str = "using"; diff --git a/pbs-datastore/src/lib.rs b/pbs-datastore/src/lib.rs index 6647ee2b6..29d203f87 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 891644d7a..fb41e863c 100644 --- a/pbs-datastore/src/move_journal.rs +++ b/pbs-datastore/src/move_journal.rs @@ -54,7 +54,7 @@ use proxmox_sys::fs::{open_file_locked, CreateOptions}; 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