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 7BBB01FF161 for ; Wed, 20 Nov 2024 11:55:04 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B1BBFCBBB; Wed, 20 Nov 2024 11:55:11 +0100 (CET) From: Gabriel Goller To: pbs-devel@lists.proxmox.com Date: Wed, 20 Nov 2024 11:55:05 +0100 Message-Id: <20241120105505.238476-1-g.goller@proxmox.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 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 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] [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" 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