[pbs-devel] [PATCH proxmox-backup v12 08/26] api: removable datastore creation

[Fabian Grünbichler]

On September 4, 2024 4:11 pm, Hannes Laimer wrote:
> Signed-off-by: Hannes Laimer <h.laimer at proxmox.com>
> ---
>  src/api2/config/datastore.rs | 37 ++++++++++++++++++++++++++++++++----
>  1 file changed, 33 insertions(+), 4 deletions(-)
> 
> diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs
> index ca6edf05..c24b6e9d 100644
> --- a/src/api2/config/datastore.rs
> +++ b/src/api2/config/datastore.rs
> @@ -4,7 +4,7 @@ use ::serde::{Deserialize, Serialize};
>  use anyhow::Error;
>  use hex::FromHex;
>  use serde_json::Value;
> -use tracing::warn;
> +use tracing::{info, warn};
>  
>  use proxmox_router::{http_bail, Permission, Router, RpcEnvironment, RpcEnvironmentType};
>  use proxmox_schema::{api, param_bail, ApiType};
> @@ -20,7 +20,8 @@ use pbs_config::BackupLockGuard;
>  use pbs_datastore::chunk_store::ChunkStore;
>  
>  use crate::api2::admin::{
> -    prune::list_prune_jobs, sync::list_sync_jobs, verify::list_verification_jobs,
> +    datastore::do_mount_device, prune::list_prune_jobs, sync::list_sync_jobs,
> +    verify::list_verification_jobs,
>  };
>  use crate::api2::config::prune::{delete_prune_job, do_create_prune_job};
>  use crate::api2::config::sync::delete_sync_job;
> @@ -71,13 +72,30 @@ pub(crate) fn do_create_datastore(
>      mut config: SectionConfigData,
>      datastore: DataStoreConfig,
>  ) -> Result<(), Error> {
> -    let path: PathBuf = datastore.path.clone().into();
> +    let path: PathBuf = datastore.absolute_path().into();
> +    let backup_user = pbs_config::backup_user()?;
> +    if let Some(store_mount_point) = datastore.get_mount_point() {
> +        let default_options = proxmox_sys::fs::CreateOptions::new();
> +        proxmox_sys::fs::create_path(
> +            store_mount_point,
> +            Some(default_options.clone()),
> +            Some(default_options.clone()),
> +        )?;
> +        do_mount_device(datastore.clone())?;
> +
> +        if path.join(".chunks").is_dir() {
> +            config.set_data(&datastore.name, "datastore", &datastore)?;
> +            pbs_config::datastore::save_config(&config)?;
> +            jobstate::create_state_file("garbage_collection", &datastore.name)?;
> +            info!("created removable datastore, chunkstore already exists");
> +            return Ok(());
> +        }
> +    }
>  
>      let tuning: DatastoreTuning = serde_json::from_value(
>          DatastoreTuning::API_SCHEMA
>              .parse_property_string(datastore.tuning.as_deref().unwrap_or(""))?,
>      )?;
> -    let backup_user = pbs_config::backup_user()?;

why is this line moved?

>      let _store = ChunkStore::create(
>          &datastore.name,
>          path,
> @@ -120,6 +138,17 @@ pub fn create_datastore(
>          param_bail!("name", "datastore '{}' already exists.", config.name);
>      }
>  
> +    if let Some(uuid) = &config.backing_device {
> +        for (datastore_name, (_, config)) in &section_config.sections {
> +            if config["backing-device"].as_str() == Some(uuid) {
> +                param_bail!(
> +                    "backing-device",
> +                    "device already in use by datastore '{datastore_name}'",
> +                );

that's a pretty harsh limitation.. that could be easily lifted? since
datastores are the trust boundary, having more than one on a single
removable device can make a lot of sense (e.g., for cold storage of
multiple non-removable datastores).

we actually only require path+UUID to be unique (well, that and path not
being nested for each unique UUID, but that is also true for
non-removable datastores and IIRC we don't check it there anywhere
either ;)).

> +            }
> +        }
> +    }
> +
>      let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?;
>      let to_stdout = rpcenv.env_type() == RpcEnvironmentType::CLI;
>  
> -- 
> 2.39.2
> 
> 
> 
> _______________________________________________
> pbs-devel mailing list
> pbs-devel at lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
> 
> 
>