tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

api2/node/disks/zfs: check if default zfs mount path exists

Browse Source 
and if it does bail, because otherwise we would get an
error on mounting and have a zpool that is not imported
and disks that are used

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2020-06-23 16:00:12 +02:00 committed by Dietmar Maurer
parent 6e1f0c138f
commit b91b7d9ffd
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/api2/node/disks/zfs.rs
View File

@ -298,6 +298,18 @@ pub fn create_zpool(
bail!("{:?} needs at least {} disks.", raidlevel, min_disks); bail!("{:?} needs at least {} disks.", raidlevel, min_disks);
} }
// check if the default path does exist already and bail if it does
// otherwise we get an error on mounting
let mut default_path = std::path::PathBuf::from("/");
default_path.push(&name);
match std::fs::metadata(&default_path) {
Err(_) => {}, // path does not exist
Ok(_) => {
bail!("path {:?} already exists", default_path);
}
}
let upid_str = WorkerTask::new_thread( let upid_str = WorkerTask::new_thread(
"zfscreate", Some(name.clone()), &username.clone(), to_stdout, move |worker| "zfscreate", Some(name.clone()), &username.clone(), to_stdout, move |worker|
{ {