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 701956150C for ; Thu, 3 Dec 2020 10:00:53 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 66FC624C47 for ; Thu, 3 Dec 2020 10:00:23 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 firstgate.proxmox.com (Proxmox) with ESMTPS id DE9DE24C3C for ; Thu, 3 Dec 2020 10:00:22 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id A486F4470D for ; Thu, 3 Dec 2020 10:00:22 +0100 (CET) Date: Thu, 3 Dec 2020 10:00:21 +0100 From: Wolfgang Bumiller To: Dominik Csapak Cc: pbs-devel@lists.proxmox.com Message-ID: <20201203090021.iu365pyptub4y6w6@wobu-vie.proxmox.com> References: <20201202145519.2806-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201202145519.2806-1-d.csapak@proxmox.com> User-Agent: NeoMutt/20180716 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.019 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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] applied: [PATCH proxmox-backup v2] backup/datastore: move manifest locking to /run 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: Thu, 03 Dec 2020 09:00:53 -0000 applied On Wed, Dec 02, 2020 at 03:55:19PM +0100, Dominik Csapak wrote: > this fixes the issue that on some filesystems, you cannot recursively > remove a directory when you hold a lock on a file inside (e.g. nfs/cifs) > > it is not really backwards compatible (so during an upgrade, there > could be two daemons have the lock), but since the locking was > broken before (see previous patch) it should not really matter > (also it seems very unlikely that someone will trigger this) > > Signed-off-by: Dominik Csapak > --- > changes from v1: > * document the path method > * use String instead of PathBuf and use write! to change it > src/backup/datastore.rs | 31 ++++++++++++++++++++++++++++--- > 1 file changed, 28 insertions(+), 3 deletions(-) > > diff --git a/src/backup/datastore.rs b/src/backup/datastore.rs > index 0f74ac3c..19e7ccba 100644 > --- a/src/backup/datastore.rs > +++ b/src/backup/datastore.rs > @@ -257,6 +257,12 @@ impl DataStore { > ) > })?; > > + // the manifest does not exists anymore, we do not need to keep the lock > + if let Ok(path) = self.manifest_lock_path(backup_dir) { > + // ignore errors > + let _ = std::fs::remove_file(path); > + } > + > Ok(()) > } > > @@ -698,13 +704,32 @@ impl DataStore { > )) > } > > + /// Returns the filename to lock a manifest > + /// > + /// Also creates the basedir. The lockfile is located in > + /// '/run/proxmox-backup/locks/{datastore}/{type}/{id}/{timestamp}.index.json.lck' > + fn manifest_lock_path( > + &self, > + backup_dir: &BackupDir, > + ) -> Result { > + let mut path = format!( > + "/run/proxmox-backup/locks/{}/{}/{}", > + self.name(), > + backup_dir.group().backup_type(), > + backup_dir.group().backup_id(), > + ); > + std::fs::create_dir_all(&path)?; > + use std::fmt::Write; > + write!(path, "/{}{}", backup_dir.backup_time_string(), &MANIFEST_LOCK_NAME)?; > + > + Ok(path) > + } > + > fn lock_manifest( > &self, > backup_dir: &BackupDir, > ) -> Result { > - let mut path = self.base_path(); > - path.push(backup_dir.relative_path()); > - path.push(&MANIFEST_LOCK_NAME); > + let path = self.manifest_lock_path(backup_dir)?; > > // 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 > -- > 2.20.1