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 613EE1FF161 for ; Wed, 20 Nov 2024 11:52:21 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3C3D2C8A1; Wed, 20 Nov 2024 11:52:28 +0100 (CET) Date: Wed, 20 Nov 2024 11:51:54 +0100 From: Gabriel Goller To: Fiona Ebner Message-ID: <62qdxfi2wjug63bnp3e7qcxh2w4b5tk4u5lzm7lgdvf7nqx57j@iz5m3zy6tpcs> References: <20241119161725.519650-1-g.goller@proxmox.com> <9ea533d6-7c5f-41db-9f60-e2a7fc09375b@proxmox.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <9ea533d6-7c5f-41db-9f60-e2a7fc09375b@proxmox.com> User-Agent: NeoMutt/20241002-35-39f9a6 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.040 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 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [proxmox.com, datastore.rs] Subject: Re: [pbs-devel] [PATCH proxmox-backup] fix: allow datastore creation in directory with lost+found directory 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 Cc: Proxmox Backup Server development discussion Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" On 20.11.2024 11:19, Fiona Ebner wrote: >Am 19.11.24 um 17:17 schrieb Gabriel Goller: >> When creating a datastore without the "reuse-datastore" option and the >> datastore contains a `lost+found` directory (which is quite common), the >> creation fails. Add `lost+found` to the ignore list. >> >> Reported here: https://forum.proxmox.com/threads/bug-when-adding-new-storage-task-error-datastore-path-is-not-empty.157629/#post-721733 >> >> Fixes: 6e101ff75777 ("fix #5439: allow to reuse existing datastore") >> Signed-off-by: Gabriel Goller >> --- >> src/api2/config/datastore.rs | 4 +++- >> 1 file changed, 3 insertions(+), 1 deletion(-) >> >> diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs >> index 374c302fcf28..f3bf652cda76 100644 >> --- a/src/api2/config/datastore.rs >> +++ b/src/api2/config/datastore.rs >> @@ -89,7 +89,9 @@ pub(crate) fn do_create_datastore( >> if let Ok(dir) = std::fs::read_dir(&path) { >> for file in dir { >> let name = file?.file_name(); >> - if !name.to_str().map_or(false, |name| name.starts_with('.')) { >> + if !name.to_str().map_or(false, |name| { >> + name.starts_with('.') || name.starts_with("lost+found") > >Nit: while it shouldn't make much difference in practice, why use >starts_with()? Exact checking would seem more natural to me for this. Actually no idea :) Will submit a v2 with Eq. _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel