proxmox-mirrors/proxmox-backup
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox-backup synced 2025-08-08 08:52:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

node: disks: replace BASE_MOUNT_DIR with DATASTORE_MOUNT_DIR

Browse Source 
... since they do have the same value.

Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
This commit is contained in:
Hannes Laimer 2024-11-25 17:22:10 +01:00 committed by Thomas Lamprecht
parent 43466bf538
commit 42e3b2f12a
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/api2/node/disks/directory.rs
View File

@ -11,8 +11,8 @@ use proxmox_schema::api;
use proxmox_section_config::SectionConfigData; use proxmox_section_config::SectionConfigData;
use pbs_api_types::{ use pbs_api_types::{
DataStoreConfig, BLOCKDEVICE_NAME_SCHEMA, DATASTORE_SCHEMA, NODE_SCHEMA, PRIV_SYS_AUDIT, DataStoreConfig, BLOCKDEVICE_NAME_SCHEMA, DATASTORE_MOUNT_DIR, DATASTORE_SCHEMA, NODE_SCHEMA,
PRIV_SYS_MODIFY, UPID_SCHEMA, PRIV_SYS_AUDIT, PRIV_SYS_MODIFY, UPID_SCHEMA,
}; };
use crate::tools::disks::{ use crate::tools::disks::{
@ -23,8 +23,6 @@ use crate::tools::systemd::{self, types::*};
use proxmox_rest_server::WorkerTask; use proxmox_rest_server::WorkerTask;
const BASE_MOUNT_DIR: &str = "/mnt/datastore/";
#[api( #[api(
properties: { properties: {
"filesystem": { "filesystem": {
@ -91,7 +89,7 @@ pub fn list_datastore_mounts() -> Result<Vec<DatastoreMountInfo>, Error> {
let name = data let name = data
.Where .Where
.strip_prefix(BASE_MOUNT_DIR) .strip_prefix(DATASTORE_MOUNT_DIR)
.unwrap_or(&data.Where) .unwrap_or(&data.Where)
.to_string(); .to_string();
@ -185,7 +183,7 @@ pub fn create_datastore_disk(
bail!("disk '{}' is already in use.", disk); bail!("disk '{}' is already in use.", disk);
} }
let mount_point = format!("{}{}", BASE_MOUNT_DIR, &name); let mount_point = format!("{}/{}", DATASTORE_MOUNT_DIR, &name);
// check if the default path exists already. // check if the default path exists already.
// bail if it is not empty or another filesystem mounted on top // bail if it is not empty or another filesystem mounted on top
let default_path = std::path::PathBuf::from(&mount_point); let default_path = std::path::PathBuf::from(&mount_point);
@ -193,7 +191,7 @@ pub fn create_datastore_disk(
match std::fs::metadata(&default_path) { match std::fs::metadata(&default_path) {
Err(_) => {} // path does not exist Err(_) => {} // path does not exist
Ok(stat) => { Ok(stat) => {
let basedir_dev = std::fs::metadata(BASE_MOUNT_DIR)?.st_dev(); let basedir_dev = std::fs::metadata(DATASTORE_MOUNT_DIR)?.st_dev();
if stat.st_dev() != basedir_dev { if stat.st_dev() != basedir_dev {
bail!("path {default_path:?} already exists and is mountpoint"); bail!("path {default_path:?} already exists and is mountpoint");
} }
@ -278,7 +276,7 @@ pub fn create_datastore_disk(
)] )]
/// Remove a Filesystem mounted under `/mnt/datastore/<name>`. /// Remove a Filesystem mounted under `/mnt/datastore/<name>`.
pub fn delete_datastore_disk(name: String) -> Result<(), Error> { pub fn delete_datastore_disk(name: String) -> Result<(), Error> {
let path = format!("{}{}", BASE_MOUNT_DIR, name); let path = format!("{}/{}", DATASTORE_MOUNT_DIR, name);
// path of datastore cannot be changed // path of datastore cannot be changed
let (config, _) = pbs_config::datastore::config()?; let (config, _) = pbs_config::datastore::config()?;
let datastores: Vec<DataStoreConfig> = config.convert_to_typed_array("datastore")?; let datastores: Vec<DataStoreConfig> = config.convert_to_typed_array("datastore")?;