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 15ACB607C2 for ; Wed, 2 Dec 2020 15:07:48 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0CC6E1C881 for ; Wed, 2 Dec 2020 15:07:18 +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 42CE61C872 for ; Wed, 2 Dec 2020 15:07:16 +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 10F7344870 for ; Wed, 2 Dec 2020 15:07:16 +0100 (CET) Date: Wed, 2 Dec 2020 15:07:12 +0100 (CET) From: Wolfgang Bumiller To: Proxmox Backup Server development discussion Message-ID: <1092742103.544.1606918032738@webmail.proxmox.com> In-Reply-To: <57c91b8c-ef08-2b28-595c-20db7cb8d8da@proxmox.com> References: <20201202131957.17051-1-d.csapak@proxmox.com> <20201202131957.17051-2-d.csapak@proxmox.com> <20201202135000.nxcyky5lhnxddi6a@wobu-vie.proxmox.com> <57c91b8c-ef08-2b28-595c-20db7cb8d8da@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Priority: 3 Importance: Normal X-Mailer: Open-Xchange Mailer v7.10.4-Rev14 X-Originating-Client: open-xchange-appsuite 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: Re: [pbs-devel] [PATCH proxmox-backup 2/2] 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: Wed, 02 Dec 2020 14:07:48 -0000 > On 12/02/2020 2:58 PM Dominik Csapak wrote: > > > On 12/2/20 2:50 PM, Wolfgang Bumiller wrote: > > On Wed, Dec 02, 2020 at 02:19:57PM +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 > >> --- > >> src/backup/datastore.rs | 26 +++++++++++++++++++++++--- > >> 1 file changed, 23 insertions(+), 3 deletions(-) > >> > >> diff --git a/src/backup/datastore.rs b/src/backup/datastore.rs > >> index 0f74ac3c..9cc88906 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,27 @@ impl DataStore { > >> )) > >> } > >> > > > > please describe the path in a doc comment here > > ok, but even in a private api? Depends on what the code looks like in the end. I needed a bit to chew through the .push() and format!() mix since one implicitly separates with a slash while the other obviously does not ;-) > > > > So if I see this right, the file will then be > > /run/proxmox-backup/.locks/$store/${type}/${id}/${timestamp}.index.json.lck > > > > seems reasonable apart from the dot in `.locks` ;-) > > > > However, do we really need the directory structure here? > > Shouldn't a flat `.../locks/${type}.${id}.${timestamp}.index.json` be > > fine as well? (I don't really mind, it would just be less code ;-) ) > > for now, ids do not really have a length limit besides the fs filename > limit of 255 bytes > and since i had to factor that out, i did for datastore/type as well > (would look even weirder to use something like: > .../locks/${datastore}.${type}/${id}/${timestamp}.index.json.lck > ) > > though we probably should limit the id length anyway... 255 definitely seems too huge ;-)