From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 0D09F6985E for ; Fri, 7 Aug 2020 10:18:42 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0A9E822F40 for ; Fri, 7 Aug 2020 10:18:42 +0200 (CEST) Received: from elsa.proxmox.com (212-186-127-178.static.upcbusiness.at [212.186.127.178]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3E2F522F30 for ; Fri, 7 Aug 2020 10:18:41 +0200 (CEST) Received: by elsa.proxmox.com (Postfix, from userid 0) id 2ABADAE3B57; Fri, 7 Aug 2020 10:18:41 +0200 (CEST) From: Dietmar Maurer To: pbs-devel@lists.proxmox.com, s.reiter@proxmox.com Date: Fri, 7 Aug 2020 10:18:22 +0200 Message-Id: <20200807081823.17200-3-dietmar@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200807081823.17200-1-dietmar@proxmox.com> References: <20200807081823.17200-1-dietmar@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -1.026 Adjusted score from AWL reputation of From: address 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. [datastore.rs] Subject: [pbs-devel] [PATCH proxmox-backup 2/3] src/backup/backup_info.rs: remove BackupGroup lock() 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: , X-List-Received-Date: Fri, 07 Aug 2020 08:18:42 -0000 And use new lock_dir_noblock() instead. --- src/backup/backup_info.rs | 35 +---------------------------------- src/backup/datastore.rs | 17 ++++++----------- 2 files changed, 7 insertions(+), 45 deletions(-) diff --git a/src/backup/backup_info.rs b/src/backup/backup_info.rs index c35928c..df2349b 100644 --- a/src/backup/backup_info.rs +++ b/src/backup/backup_info.rs @@ -14,6 +14,7 @@ use lazy_static::lazy_static; use proxmox::sys::error::SysError; use super::manifest::MANIFEST_BLOB_NAME; +use crate::tools::fs::lock_dir_noblock; macro_rules! BACKUP_ID_RE { () => (r"[A-Za-z0-9][A-Za-z0-9_-]+") } macro_rules! BACKUP_TYPE_RE { () => (r"(?:host|vm|ct)") } @@ -141,40 +142,6 @@ impl BackupGroup { Ok(last) } - pub fn lock(&self, base_path: &Path) -> Result { - use nix::fcntl::OFlag; - use nix::sys::stat::Mode; - - let mut path = base_path.to_owned(); - path.push(self.group_path()); - - let mut handle = Dir::open(&path, OFlag::O_RDONLY, Mode::empty()) - .map_err(|err| { - format_err!( - "unable to open backup group directory {:?} for locking - {}", - self.group_path(), - err, - ) - })?; - - // acquire in non-blocking mode, no point in waiting here since other - // backups could still take a very long time - proxmox::tools::fs::lock_file(&mut handle, true, Some(Duration::from_nanos(0))) - .map_err(|err| { - format_err!( - "unable to acquire lock on backup group {:?} - {}", - self.group_path(), - if err.would_block() { - String::from("another backup is already running") - } else { - err.to_string() - } - ) - })?; - - Ok(handle) - } - pub fn list_groups(base_path: &Path) -> Result, Error> { let mut list = Vec::new(); diff --git a/src/backup/datastore.rs b/src/backup/datastore.rs index 395515f..dbd42d6 100644 --- a/src/backup/datastore.rs +++ b/src/backup/datastore.rs @@ -11,7 +11,7 @@ use serde_json::Value; use proxmox::tools::fs::{replace_file, CreateOptions}; -use super::backup_info::{BackupGroup, BackupLockGuard, BackupDir, BackupInfo}; +use super::backup_info::{BackupGroup, BackupDir, BackupInfo}; use super::chunk_store::ChunkStore; use super::dynamic_index::{DynamicIndexReader, DynamicIndexWriter}; use super::fixed_index::{FixedIndexReader, FixedIndexWriter}; @@ -21,6 +21,7 @@ use super::{DataBlob, ArchiveType, archive_type}; use crate::config::datastore; use crate::server::WorkerTask; use crate::tools; +use crate::tools::fs::{lock_dir_noblock, DirLockGuard}; use crate::api2::types::GarbageCollectionStatus; lazy_static! { @@ -199,13 +200,7 @@ impl DataStore { let full_path = self.group_path(backup_group); - let _guard = backup_group.lock(&self.base_path()).map_err(|err| { - format_err!( - "cannot acquire lock on backup group {}: {}", - backup_group, - err - ) - })?; + let _guard = tools::fs::lock_dir_noblock(&full_path, "backup group", "possible running backup")?; log::info!("removing backup group {:?}", full_path); std::fs::remove_dir_all(&full_path) @@ -300,7 +295,7 @@ impl DataStore { /// current owner (instead of setting the owner). /// /// This also aquires an exclusive lock on the directory and returns the lock guard. - pub fn create_locked_backup_group(&self, backup_group: &BackupGroup, userid: &str) -> Result<(String, BackupLockGuard), Error> { + pub fn create_locked_backup_group(&self, backup_group: &BackupGroup, userid: &str) -> Result<(String, DirLockGuard), Error> { // create intermediate path first: let base_path = self.base_path(); @@ -314,13 +309,13 @@ impl DataStore { // create the last component now match std::fs::create_dir(&full_path) { Ok(_) => { - let guard = backup_group.lock(&base_path)?; + let guard = lock_dir_noblock(&full_path, "backup group", "another backup is already running")?; self.set_owner(backup_group, userid, false)?; let owner = self.get_owner(backup_group)?; // just to be sure Ok((owner, guard)) } Err(ref err) if err.kind() == io::ErrorKind::AlreadyExists => { - let guard = backup_group.lock(&base_path)?; + let guard = lock_dir_noblock(&full_path, "backup group", "another backup is already running")?; let owner = self.get_owner(backup_group)?; // just to be sure Ok((owner, guard)) } -- 2.20.1