Re: [pbs-devel] [PATCH proxmox-backup v13 12/26] datastore: handle deletion of removable datastore properly

["Fabian Grünbichler" <f.gruenbichler@proxmox.com>]

On November 13, 2024 4:00 pm, Hannes Laimer wrote:
> Data deletion is only possible if the datastore is mounted, won't attempt
> mounting it for the purpose of deleting data is made.

this commit message is missing some word (or has a few too many?)

> 
> Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
> ---
>  pbs-datastore/src/datastore.rs |  4 +++-
>  src/api2/config/datastore.rs   | 37 +++++++++++++++++++++++++++++++++-
>  2 files changed, 39 insertions(+), 2 deletions(-)
> 
> diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs
> index cadf9245..83e4dcb0 100644
> --- a/pbs-datastore/src/datastore.rs
> +++ b/pbs-datastore/src/datastore.rs
> @@ -1525,7 +1525,9 @@ impl DataStore {
>                          // weird, but ok
>                      }
>                      Err(err) if err.is_errno(nix::errno::Errno::EBUSY) => {
> -                        warn!("Cannot delete datastore directory (is it a mount point?).")
> +                        if datastore_config.backing_device.is_none() {
> +                            warn!("Cannot delete datastore directory (is it a mount point?).")
> +                        }
>                      }
>                      Err(err) if err.is_errno(nix::errno::Errno::ENOTEMPTY) => {
>                          warn!("Datastore directory not empty, not deleting.")
> diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs
> index 9140a7a4..60bff9e2 100644
> --- a/src/api2/config/datastore.rs
> +++ b/src/api2/config/datastore.rs
> @@ -1,4 +1,4 @@
> -use std::path::PathBuf;
> +use std::path::{Path, PathBuf};
>  
>  use ::serde::{Deserialize, Serialize};
>  use anyhow::{bail, Error};
> @@ -29,6 +29,7 @@ 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_mounted_at;
>  use proxmox_rest_server::WorkerTask;
>  
>  use crate::server::jobstate;
> @@ -557,6 +558,21 @@ pub async fn delete_datastore(
>          http_bail!(NOT_FOUND, "datastore '{}' does not exist.", name);
>      }
>  
> +    let store_config: DataStoreConfig = config.lookup("datastore", &name)?;
> +    let mount_status = store_config
> +        .get_mount_point()
> +        .zip(store_config.backing_device.as_ref())
> +        .map(|(mount_point, device_uuid)| {
> +            is_datastore_mounted_at(mount_point, device_uuid.to_string())
> +        });

another instance of this ;)

> +
> +    if destroy_data && mount_status == Some(false) {
> +        http_bail!(
> +            BAD_REQUEST,
> +            "cannot destroy data on '{name}' unless the datastore is mounted"
> +        );
> +    }
> +
>      if !keep_job_configs {
>          for job in list_verification_jobs(Some(name.clone()), Value::Null, rpcenv)? {
>              delete_verification_job(job.config.id, None, rpcenv)?
> @@ -583,6 +599,19 @@ pub async fn delete_datastore(
>  
>      let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?;
>      let to_stdout = rpcenv.env_type() == RpcEnvironmentType::CLI;
> +    let name_copy = name.clone();

nit: why/leftover?

> +    if let Ok(proxy_pid) = proxmox_rest_server::read_pid(pbs_buildcfg::PROXMOX_BACKUP_PROXY_PID_FN)
> +    {
> +        let sock = proxmox_daemon::command_socket::path_from_pid(proxy_pid);
> +        let _ = proxmox_daemon::command_socket::send_raw(
> +            sock,
> +            &format!(
> +                "{{\"command\":\"update-datastore-cache\",\"args\":\"{}\"}}\n",
> +                name_copy
> +            ),
> +        )
> +        .await;
> +    };
>  
>      let upid = WorkerTask::new_thread(
>          "delete-datastore",
> @@ -595,6 +624,12 @@ 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 {
> +                if let Some(mount_point) = store_config.get_mount_point() {
> +                    let _ = unmount_by_mountpoint(Path::new(&mount_point));
> +                    let _ = std::fs::remove_dir(&mount_point);

errors here should be logged I think? ignoring them is okay (IMHO the
same applies above for the state files..)

> +                }
> +            }
>  
>              if let Err(err) =
>                  proxmox_async::runtime::block_on(crate::server::notify_datastore_removed())
> -- 
> 2.39.5
> 
> 
> 
> _______________________________________________
> pbs-devel mailing list
> pbs-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
> 
> 
> 


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