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

["Gabriel Goller" <g.goller@proxmox.com>]

On Tue Apr 23, 2024 at 10:29 AM CEST, Hannes Laimer wrote:
> Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
> ---
>  src/api2/node/disks/directory.rs | 64 ++++++++++++++++++++++++++++++--
>  1 file changed, 61 insertions(+), 3 deletions(-)
>
> diff --git a/src/api2/node/disks/directory.rs b/src/api2/node/disks/directory.rs
> index 73af92cc..34304216 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> {
>                  type: bool,
>                  optional: true,
>              },
> +            "removable-datastore": {
> +                description: "The the added datastore is removable.",

One 'the' too much :)

> +                type: bool,
> +                optional: true,
> +            },
>              filesystem: {
>                  type: FileSystemType,
>                  optional: true,
> @@ -141,6 +146,7 @@ pub fn create_datastore_disk(
>      name: String,
>      disk: String,
>      add_datastore: Option<bool>,
> +    removable_datastore: Option<bool>,
>      filesystem: Option<FileSystemType>,
>      rpcenv: &mut dyn RpcEnvironment,
>  ) -> Result<String, Error> {
> @@ -154,8 +160,59 @@ pub fn create_datastore_disk(
>          bail!("disk '{}' is already in use.", disk);
>      }
>  
> -    let mount_point = format!("{}{}", BASE_MOUNT_DIR, &name);
> +    if let (Some(true), Some(true)) = (add_datastore, removable_datastore) {
> +        let upid_str = WorkerTask::new_thread(
> +            "dircreate",
> +            Some(name.clone()),
> +            auth_id,
> +            to_stdout,
> +            move |worker| {
> +                task_log!(
> +                    worker,
> +                    "create removable datastore '{}' on disk {}",
> +                    name,
> +                    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,
> +                    Some(&worker),
> +                )?;
> +
> +                Ok(())
> +            },
> +        )?;
> +        return Ok(upid_str);
> +    };
> +
> +    let mount_point = format!("{}{}", BASE_MOUNT_DIR, &name);
>      // 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);
> @@ -250,8 +307,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)
> +    });
>  
>      if let Some(conflicting_datastore) = conflicting_datastore {
>          bail!(



_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel