[pbs-devel] [PATCH proxmox-backup v4 13/22] datastore: handle deletion of removable datastore properly

[Christian Ebner]

nit inline

On 4/16/24 17:24, Hannes Laimer wrote:
> Signed-off-by: Hannes Laimer <h.laimer at proxmox.com>
> ---
>   pbs-datastore/src/datastore.rs | 10 ++++++----
>   src/api2/config/datastore.rs   | 14 ++++++++++++++
>   2 files changed, 20 insertions(+), 4 deletions(-)
> 
> diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs
> index ff2ca95f..70324a01 100644
> --- a/pbs-datastore/src/datastore.rs
> +++ b/pbs-datastore/src/datastore.rs
> @@ -1504,10 +1504,12 @@ impl DataStore {
>                           // weird, but ok
>                       }
>                       Err(err) if err.is_errno(nix::errno::Errno::EBUSY) => {
> -                        task_warn!(
> -                            worker,
> -                            "Cannot delete datastore directory (is it a mount point?)."
> -                        )
> +                        if datastore_config.backing_device.is_none() {
> +                            task_warn!(
> +                                worker,
> +                                "Cannot delete datastore directory (is it a mount point?)."
> +                            )
> +                        }
>                       }
>                       Err(err) if err.is_errno(nix::errno::Errno::ENOTEMPTY) => {
>                           task_warn!(worker, "Datastore directory not empty, not deleting.")
> diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs
> index 3a075674..5729071d 100644
> --- a/src/api2/config/datastore.rs
> +++ b/src/api2/config/datastore.rs
> @@ -29,9 +29,11 @@ use crate::api2::config::tape_backup_job::{delete_tape_backup_job, list_tape_bac
>   use crate::api2::config::verify::delete_verification_job;
>   use pbs_config::CachedUserInfo;
>   
> +use pbs_datastore::is_datastore_available;
>   use proxmox_rest_server::WorkerTask;
>   
>   use crate::server::jobstate;
> +use crate::tools::disks::unmount_by_mountpoint;
>   
>   #[api(
>       input: {
> @@ -531,6 +533,14 @@ pub async fn delete_datastore(
>           http_bail!(NOT_FOUND, "datastore '{}' does not exist.", name);
>       }
>   
> +    let store_config: DataStoreConfig = config.lookup("datastore", &name)?;
> +    if destroy_data && is_datastore_available(&store_config) {
> +        http_bail!(
> +            BAD_REQUEST,
> +            "can't destroy data on '{name}' unless the datastore is mounted"

nit: s/can't/cannot

> +        );
> +    }
> +
>       if !keep_job_configs {
>           for job in list_verification_jobs(Some(name.clone()), Value::Null, rpcenv)? {
>               delete_verification_job(job.config.id, None, rpcenv)?
> @@ -569,6 +579,10 @@ pub async fn delete_datastore(
>               // ignore errors
>               let _ = jobstate::remove_state_file("prune", &name);
>               let _ = jobstate::remove_state_file("garbage_collection", &name);
> +            if destroy_data && store_config.backing_device.is_some() {
> +                let _ = unmount_by_mountpoint(&store_config.path);
> +                let _ = std::fs::remove_dir(&store_config.path);
> +            }
>   
>               if let Err(err) =
>                   proxmox_async::runtime::block_on(crate::server::notify_datastore_removed())