[pbs-devel] [PATCH proxmox-backup v13 22/26] api: node: allow creation of removable datastore through directory endpoint

[Fabian Grünbichler]

On November 13, 2024 4:00 pm, Hannes Laimer wrote:
> Signed-off-by: Hannes Laimer <h.laimer at proxmox.com>
> ---
>  src/api2/node/disks/directory.rs | 59 +++++++++++++++++++++++++++++---
>  1 file changed, 54 insertions(+), 5 deletions(-)
> 
> diff --git a/src/api2/node/disks/directory.rs b/src/api2/node/disks/directory.rs
> index 7f540220..7e020e27 100644
> --- a/src/api2/node/disks/directory.rs
> +++ b/src/api2/node/disks/directory.rs
> @@ -123,6 +123,11 @@ pub fn list_datastore_mounts() -> Result<Vec<DatastoreMountInfo>, Error> {
>                  description: "Configure a datastore using the directory.",
>                  type: bool,
>                  optional: true,
> +                default: false,
> +            },
> +            "removable-datastore": {
> +                description: "The added datastore is removable.",
> +                type: bool,
>              },
>              filesystem: {
>                  type: FileSystemType,
> @@ -141,7 +146,8 @@ pub fn list_datastore_mounts() -> Result<Vec<DatastoreMountInfo>, Error> {
>  pub fn create_datastore_disk(
>      name: String,
>      disk: String,
> -    add_datastore: Option<bool>,
> +    add_datastore: bool,
> +    removable_datastore: bool,
>      filesystem: Option<FileSystemType>,
>      rpcenv: &mut dyn RpcEnvironment,
>  ) -> Result<String, Error> {
> @@ -155,8 +161,51 @@ pub fn create_datastore_disk(
>          bail!("disk '{}' is already in use.", disk);
>      }
>  
> -    let mount_point = format!("{}{}", BASE_MOUNT_DIR, &name);
> +    if add_datastore && removable_datastore {
> +        let upid_str = WorkerTask::new_thread(
> +            "dircreate",
> +            Some(name.clone()),
> +            auth_id,
> +            to_stdout,
> +            move |_worker| {
> +                info!("create removable datastore '{name}' on disk {disk}");
> +
> +                let filesystem = filesystem.unwrap_or(FileSystemType::Ext4);
> +
> +                let manager = DiskManage::new();
> +
> +                let disk = manager.disk_by_name(&disk)?;
> +
> +                let partition = create_single_linux_partition(&disk)?;
> +                create_file_system(&partition, filesystem)?;
> +
> +                let uuid = get_fs_uuid(&partition)?;
> +
> +                let lock = pbs_config::datastore::lock_config()?;
> +                let datastore: DataStoreConfig = serde_json::from_value(
> +                    json!({ "name": name, "path": name, "backing-device": uuid }),
> +                )?;
> +
> +                let (config, _digest) = pbs_config::datastore::config()?;
>  
> +                if config.sections.get(&datastore.name).is_some() {
> +                    bail!("datastore '{}' already exists.", datastore.name);
> +                }
> +
> +                // we don't have to check if the UUID is already in use since we just created the
> +                // fs ourself
> +
> +                crate::api2::config::datastore::do_create_datastore(
> +                    lock, config, datastore, false,

this is also the case for the regular non-removable datastores here, but
it also means that one bug in create_datastore was missed, and some
checks are missing (some can never fail, but nested checks would make
sense for the non-removable existing code below as well, so maybe they
should be moved out into a helper that can be re-used for that?)

> +                )?;
> +
> +                Ok(())
> +            },

this is very similar to the code below (note shown here in the patch)
for non-removable datastores, and could easily be switched around..

> +        )?;
> +        return Ok(upid_str);
> +    };
> +
> +    let mount_point = format!("{}{}", BASE_MOUNT_DIR, &name);

if this part here is skipped for removable datastores, then a single
worker thread implementation with some conditional parts can be used..

>      // 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);
> @@ -183,7 +232,6 @@ pub fn create_datastore_disk(
>          move |_worker| {
>              info!("create datastore '{name}' on disk {disk}");
>  
> -            let add_datastore = add_datastore.unwrap_or(false);
>              let filesystem = filesystem.unwrap_or(FileSystemType::Ext4);
>  
>              let manager = DiskManage::new();
> @@ -248,8 +296,9 @@ pub fn delete_datastore_disk(name: String) -> Result<(), Error> {
>      // path of datastore cannot be changed
>      let (config, _) = pbs_config::datastore::config()?;
>      let datastores: Vec<DataStoreConfig> = config.convert_to_typed_array("datastore")?;
> -    let conflicting_datastore: Option<DataStoreConfig> =
> -        datastores.into_iter().find(|ds| ds.absolute_path() == path);
> +    let conflicting_datastore: Option<DataStoreConfig> = datastores.into_iter().find(|ds| {
> +        ds.absolute_path() == path || ds.get_mount_point().map_or(false, |mp| mp == path)

isn't this redundant? for removable datastores, absolute_path will match
path as well..

> +    });
>  
>      if let Some(conflicting_datastore) = conflicting_datastore {
>          bail!(
> -- 
> 2.39.5
> 
> 
> 
> _______________________________________________
> pbs-devel mailing list
> pbs-devel at lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
> 
> 
>