[pbs-devel] [PATCH proxmox-backup v3 14/24] datastore: handle deletion of removable datastore properly
Christian Ebner
c.ebner at proxmox.com
Tue Apr 16 10:10:33 CEST 2024
comments inline
On 4/9/24 13:00, Hannes Laimer wrote:
> Signed-off-by: Hannes Laimer <h.laimer at proxmox.com>
> ---
> pbs-datastore/src/datastore.rs | 10 ++++++----
> src/api2/config/datastore.rs | 15 +++++++++++++++
> 2 files changed, 21 insertions(+), 4 deletions(-)
>
> diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs
> index db47205c..1290baee 100644
> --- a/pbs-datastore/src/datastore.rs
> +++ b/pbs-datastore/src/datastore.rs
> @@ -1481,10 +1481,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 0194d7d4..1b34313f 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::check_if_available;
> use proxmox_rest_server::WorkerTask;
>
> use crate::server::jobstate;
> +use crate::tools::disks::unmount_by_mountpoint;
>
> #[api(
> input: {
> @@ -528,6 +530,15 @@ 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 && check_if_available(&store_config).is_err() {
> + http_bail!(
> + BAD_REQUEST,
> + "can't destroy data on '{}' unless the device is plugged in",
> + name
> + );
s/can't/cannot and inline name
> + }
> +
> if !keep_job_configs {
> for job in list_verification_jobs(Some(name.clone()), Value::Null, rpcenv)? {
> delete_verification_job(job.config.id, None, rpcenv)?
> @@ -566,6 +577,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())
More information about the pbs-devel
mailing list