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 845101FF173 for ; Mon, 10 Mar 2025 15:36:58 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 018561C021; Mon, 10 Mar 2025 15:36:52 +0100 (CET) From: Shannon Sterz To: pbs-devel@lists.proxmox.com Date: Mon, 10 Mar 2025 15:36:06 +0100 Message-Id: <20250310143607.298339-4-s.sterz@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250310143607.298339-1-s.sterz@proxmox.com> References: <20250310143607.298339-1-s.sterz@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.989 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 KAM_MAILER 2 Automated Mailer Tag Left in Email RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH proxmox-backup 3/4] fix #3935: datastore: move manifest locking to new locking method X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" adds double stat'ing and removes directory hierarchy to bring manifest locking in-line with other locks used by the BackupDir trait. Signed-off-by: Shannon Sterz --- pbs-datastore/src/backup_info.rs | 34 ++++++++++++++++---------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/pbs-datastore/src/backup_info.rs b/pbs-datastore/src/backup_info.rs index 5496e053..4bfd4393 100644 --- a/pbs-datastore/src/backup_info.rs +++ b/pbs-datastore/src/backup_info.rs @@ -448,25 +448,28 @@ impl BackupDir { /// Returns the filename to lock a manifest /// /// Also creates the basedir. The lockfile is located in - /// '/run/proxmox-backup/locks/{datastore}/[ns/{ns}/]+{type}/{id}/{timestamp}.index.json.lck' - fn manifest_lock_path(&self) -> Result { - let mut path = PathBuf::from(&format!("/run/proxmox-backup/locks/{}", self.store.name())); - path.push(self.relative_path()); + /// `${DATASTORE_LOCKS_DIR}/${datastore name}/${lock_file_path_helper(rpath)}.index.json.lck` + /// where rpath is the relative path of the snapshot. + fn manifest_lock_path(&self) -> PathBuf { + let path = Path::new(DATASTORE_LOCKS_DIR).join(self.store.name()); - std::fs::create_dir_all(&path)?; - let ts = self.backup_time_string(); - path.push(format!("{ts}{MANIFEST_LOCK_NAME}")); + let rpath = Path::new(self.dir.group.ty.as_str()) + .join(&self.dir.group.id) + .join(&self.backup_time_string) + .join(MANIFEST_LOCK_NAME); - Ok(path) + path.join(lock_file_path_helper(&self.ns, rpath)) } /// Locks the manifest of a snapshot, for example, to update or delete it. pub(crate) fn lock_manifest(&self) -> Result { - let path = self.manifest_lock_path()?; - - // actions locking the manifest should be relatively short, only wait a few seconds - open_backup_lockfile(&path, Some(std::time::Duration::from_secs(5)), true) - .map_err(|err| format_err!("unable to acquire manifest lock {:?} - {}", &path, err)) + lock_helper(self.store.name(), &self.manifest_lock_path(), |p| { + // update_manifest should never take a long time, so if + // someone else has the lock we can simply block a bit + // and should get it soon + open_backup_lockfile(p, Some(Duration::from_secs(5)), true) + .map_err(|err| format_err!("unable to acquire manifest lock {p:?} - {err}")) + }) } /// Returns a file name for locking a snapshot. @@ -521,10 +524,7 @@ impl BackupDir { })?; // remove no longer needed lock files - if let Ok(path) = self.manifest_lock_path() { - let _ = std::fs::remove_file(path); // ignore errors - } - + let _ = std::fs::remove_file(self.manifest_lock_path()); // ignore errors let _ = std::fs::remove_file(self.lock_path()); // ignore errors Ok(()) -- 2.39.5 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel