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

[Wolfgang Bumiller <w.bumiller@proxmox.com>]

On Tue, Apr 23, 2024 at 10:29:42AM +0200, Hannes Laimer wrote:
> Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
> ---
>  src/api2/config/datastore.rs | 63 +++++++++++++++++++++++++++++++++---
>  1 file changed, 59 insertions(+), 4 deletions(-)
> 
> diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs
> index 87425ff5..ac1248b3 100644
> --- a/src/api2/config/datastore.rs
> +++ b/src/api2/config/datastore.rs
> @@ -8,7 +8,7 @@ use serde_json::Value;
>  use proxmox_router::{http_bail, Permission, Router, RpcEnvironment, RpcEnvironmentType};
>  use proxmox_schema::{api, param_bail, ApiType};
>  use proxmox_section_config::SectionConfigData;
> -use proxmox_sys::{task_warn, WorkerTaskContext};
> +use proxmox_sys::{task_log, task_warn, WorkerTaskContext};
>  use proxmox_uuid::Uuid;
>  
>  use pbs_api_types::{
> @@ -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;
> @@ -72,13 +73,45 @@ pub(crate) fn do_create_datastore(
>      datastore: DataStoreConfig,
>      worker: Option<&dyn WorkerTaskContext>,
>  ) -> Result<(), Error> {
> -    let path: PathBuf = datastore.path.clone().into();
> +    let mut 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(), worker)?;
> +
> +        let dir_opts = proxmox_sys::fs::CreateOptions::new()
> +            .owner(backup_user.uid)
> +            .group(backup_user.gid);
> +        proxmox_sys::fs::create_path(
> +            datastore.absolute_path(),
> +            Some(default_options),
> +            Some(dir_opts),
> +        )?;

^ The create_path call can be dropped, since ChunkStore::create already
does this.

> +
> +        path.push(".chunks");
> +        if path.is_dir() {
> +            config.set_data(&datastore.name, "datastore", &datastore)?;
> +            pbs_config::datastore::save_config(&config)?;
> +            jobstate::create_state_file("garbage_collection", &datastore.name)?;
> +            if let Some(worker) = worker {
> +                task_log!(
> +                    worker,
> +                    "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()?;
>      let _store = ChunkStore::create(
>          &datastore.name,
>          path,


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