From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <m.frank@proxmox.com>
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) server-digest SHA256)
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id E9585B406A
for <pbs-devel@lists.proxmox.com>; Thu, 30 Nov 2023 11:37:38 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id CFA66138C9
for <pbs-devel@lists.proxmox.com>; Thu, 30 Nov 2023 11:37:38 +0100 (CET)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
[94.136.29.106])
(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
for <pbs-devel@lists.proxmox.com>; Thu, 30 Nov 2023 11:37:37 +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 9CBD041DAF
for <pbs-devel@lists.proxmox.com>; Thu, 30 Nov 2023 11:37:37 +0100 (CET)
From: Markus Frank <m.frank@proxmox.com>
To: pbs-devel@lists.proxmox.com
Date: Thu, 30 Nov 2023 11:37:24 +0100
Message-Id: <20231130103724.46301-1-m.frank@proxmox.com>
X-Mailer: git-send-email 2.39.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.034 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
T_SCC_BODY_TEXT_LINE -0.01 -
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [directory.rs]
Subject: [pbs-devel] [PATCH proxmox-backup v3] api: enhance directory
existence check
X-BeenThere: pbs-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Backup Server development discussion
<pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Thu, 30 Nov 2023 10:37:39 -0000
If a directory exists on the specified path,
it now also checks whether the directory is empty and not already mounted.
Previously, if a directory were deleted and a directory with the same name
would be created, the old check prevented the creation even though the
directory could be used as a mount point.
Signed-off-by: Markus Frank <m.frank@proxmox.com>
Tested-by: Christian Ebner <c.ebner@proxmox.com>
---
v3: changed comment
v2: added check if another file system is mounted on the specified path
src/api2/node/disks/directory.rs | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/api2/node/disks/directory.rs b/src/api2/node/disks/directory.rs
index 5e1cb124..9f1112a9 100644
--- a/src/api2/node/disks/directory.rs
+++ b/src/api2/node/disks/directory.rs
@@ -1,6 +1,7 @@
use ::serde::{Deserialize, Serialize};
use anyhow::{bail, Error};
use serde_json::json;
+use std::os::linux::fs::MetadataExt;
use proxmox_router::{Permission, Router, RpcEnvironment, RpcEnvironmentType};
use proxmox_schema::api;
@@ -155,13 +156,21 @@ pub fn create_datastore_disk(
let mount_point = format!("{}{}", BASE_MOUNT_DIR, &name);
- // check if the default path does exist already and bail if it does
+ // check if the default path exists already.
+ // bail if it is not empty or another filesystem mounted on top
let default_path = std::path::PathBuf::from(&mount_point);
match std::fs::metadata(&default_path) {
Err(_) => {} // path does not exist
- Ok(_) => {
- bail!("path {:?} already exists", default_path);
+ Ok(stat) => {
+ let basedir_dev = std::fs::metadata(BASE_MOUNT_DIR)?.st_dev();
+ if stat.st_dev() != basedir_dev {
+ bail!("path {default_path:?} already exists and is mountpoint");
+ }
+ let is_empty = default_path.read_dir()?.next().is_none();
+ if !is_empty {
+ bail!("path {default_path:?} already exists and is not empty");
+ }
}
}
--
2.39.2