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 F0EF71FF164 for ; Fri, 22 Nov 2024 09:07:59 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D2052C190; Fri, 22 Nov 2024 09:08:08 +0100 (CET) MIME-Version: 1.0 In-Reply-To: <20241120105505.238476-1-g.goller@proxmox.com> References: <20241120105505.238476-1-g.goller@proxmox.com> From: Fabian =?utf-8?q?Gr=C3=BCnbichler?= To: Gabriel Goller , pbs-devel@lists.proxmox.com Date: Fri, 22 Nov 2024 09:08:01 +0100 Message-ID: <173226288122.2118190.4517531377570129879@yuna.proxmox.com> User-Agent: alot/0.10 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.049 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 Subject: [pbs-devel] applied: [PATCH proxmox-backup v2] 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" with a slight style change by pulling out the `to_str()` into its own line, to reduce the total number of lines ;) Quoting Gabriel Goller (2024-11-20 11:55:05) > 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 > --- > > v2, thanks @Fiona: > - exact match with == instead of `.starts_with` > > src/api2/config/datastore.rs | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs > index 374c302fcf28..9c36cb312a99 100644 > --- a/src/api2/config/datastore.rs > +++ b/src/api2/config/datastore.rs > @@ -89,7 +89,10 @@ 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 == "lost+found") > + { > bail!("datastore path is not empty"); > } > } > -- > 2.39.5 > > > > _______________________________________________ > pbs-devel mailing list > pbs-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel > > _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel