From: Fabian Ebner <f.ebner@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 2/2] bail if mount point already exists for directories
Date: Thu, 5 Nov 2020 14:36:29 +0100 [thread overview]
Message-ID: <20201105133629.9802-2-f.ebner@proxmox.com> (raw)
In-Reply-To: <20201105133629.9802-1-f.ebner@proxmox.com>
similar to what we do for zfs. By bailing before partitioning, the disk is
still considered unused after a failed attempt.
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
There is no other caller for create_datastore_mount_unit, so the check from
the not yet applied https://lists.proxmox.com/pipermail/pbs-devel/2020-November/001297.html
is superseded by this.
src/api2/node/disks/directory.rs | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/api2/node/disks/directory.rs b/src/api2/node/disks/directory.rs
index 2a4780f2..da16e753 100644
--- a/src/api2/node/disks/directory.rs
+++ b/src/api2/node/disks/directory.rs
@@ -142,6 +142,18 @@ pub fn create_datastore_disk(
bail!("disk '{}' is already in use.", disk);
}
+ let mount_point = format!("/mnt/datastore/{}", &name);
+
+ // check if the default path does exist already and bail if it does
+ 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);
+ }
+ }
+
let upid_str = WorkerTask::new_thread(
"dircreate", Some(name.clone()), auth_id, to_stdout, move |worker|
{
@@ -160,7 +172,7 @@ pub fn create_datastore_disk(
let uuid = get_fs_uuid(&partition)?;
let uuid_path = format!("/dev/disk/by-uuid/{}", uuid);
- let (mount_unit_name, mount_point) = create_datastore_mount_unit(&name, filesystem, &uuid_path)?;
+ let mount_unit_name = create_datastore_mount_unit(&name, &mount_point, filesystem, &uuid_path)?;
systemd::reload_daemon()?;
systemd::enable_unit(&mount_unit_name)?;
@@ -243,11 +255,11 @@ pub const ROUTER: Router = Router::new()
fn create_datastore_mount_unit(
datastore_name: &str,
+ mount_point: &str,
fs_type: FileSystemType,
what: &str,
-) -> Result<(String, String), Error> {
+) -> Result<String, Error> {
- let mount_point = format!("/mnt/datastore/{}", datastore_name);
let mut mount_unit_name = systemd::escape_unit(&mount_point, true);
mount_unit_name.push_str(".mount");
@@ -265,7 +277,7 @@ fn create_datastore_mount_unit(
let mount = SystemdMountSection {
What: what.to_string(),
- Where: mount_point.clone(),
+ Where: mount_point.to_string(),
Type: Some(fs_type.to_string()),
Options: Some(String::from("defaults")),
..Default::default()
@@ -278,5 +290,5 @@ fn create_datastore_mount_unit(
systemd::config::save_systemd_mount(&mount_unit_path, &config)?;
- Ok((mount_unit_name, mount_point))
+ Ok(mount_unit_name)
}
--
2.20.1
next prev parent reply other threads:[~2020-11-05 13:42 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-05 13:36 [pbs-devel] [PATCH proxmox-backup 1/2] mount zpools created via API under /mnt/datastore Fabian Ebner
2020-11-05 13:36 ` Fabian Ebner [this message]
2020-11-10 8:37 ` [pbs-devel] applied: [PATCH proxmox-backup 2/2] bail if mount point already exists for directories Thomas Lamprecht
2020-11-10 8:37 ` [pbs-devel] applied: [PATCH proxmox-backup 1/2] mount zpools created via API under /mnt/datastore Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201105133629.9802-2-f.ebner@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox