From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 0848693764 for ; Tue, 9 Apr 2024 13:01:01 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 272031BBBF for ; Tue, 9 Apr 2024 13:00:29 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 9 Apr 2024 13:00:25 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id C0F57430F2 for ; Tue, 9 Apr 2024 13:00:22 +0200 (CEST) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Tue, 9 Apr 2024 13:00:02 +0200 Message-Id: <20240409110012.166472-15-h.laimer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240409110012.166472-1-h.laimer@proxmox.com> References: <20240409110012.166472-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.011 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 v3 14/24] 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: , X-List-Received-Date: Tue, 09 Apr 2024 11:01:01 -0000 Signed-off-by: Hannes Laimer --- 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 + ); + } + 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()) -- 2.39.2