From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id BE0FE20EC91 for ; Thu, 25 Apr 2024 08:53:37 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D7C951B4C5; Thu, 25 Apr 2024 08:53:40 +0200 (CEST) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Thu, 25 Apr 2024 08:53:02 +0200 Message-Id: <20240425065315.42617-14-h.laimer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240425065315.42617-1-h.laimer@proxmox.com> References: <20240425065315.42617-1-h.laimer@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.009 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH proxmox-backup v10 13/26] datastore: handle deletion of removable datastore properly X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" Signed-off-by: Hannes Laimer --- pbs-datastore/src/datastore.rs | 10 ++++++---- src/api2/config/datastore.rs | 16 ++++++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs index 4f7865fb..3b8af833 100644 --- a/pbs-datastore/src/datastore.rs +++ b/pbs-datastore/src/datastore.rs @@ -1528,10 +1528,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 401fbccf..fae44a75 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: { @@ -541,6 +543,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, + "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)? @@ -579,6 +589,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(&mount_point); + let _ = std::fs::remove_dir(&mount_point); + } + } if let Err(err) = proxmox_async::runtime::block_on(crate::server::notify_datastore_removed()) -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel