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 8C8971FF164 for ; Fri, 22 Nov 2024 15:47:43 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3E52B15795; Fri, 22 Nov 2024 15:47:52 +0100 (CET) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Fri, 22 Nov 2024 15:46:58 +0100 Message-Id: <20241122144713.299130-12-h.laimer@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241122144713.299130-1-h.laimer@proxmox.com> References: <20241122144713.299130-1-h.laimer@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.024 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 v14 11/25] 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" Data deletion is only possible if the datastore is mounted, won't attempt mounting it for the purpose of deleting data. Signed-off-by: Hannes Laimer --- changes since v13: * log warn! on errors in cleanup * also unmount without destroy_data pbs-datastore/src/datastore.rs | 4 +++- src/api2/config/datastore.rs | 39 +++++++++++++++++++++++++++++++++- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs index 6a9fc2dc0..adf29f183 100644 --- a/pbs-datastore/src/datastore.rs +++ b/pbs-datastore/src/datastore.rs @@ -1535,7 +1535,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 75e1a1a56..5c2fd2573 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, format_err, Error}; @@ -30,6 +30,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::get_datastore_mount_status; use proxmox_rest_server::WorkerTask; use crate::server::jobstate; @@ -561,6 +562,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 && get_datastore_mount_status(&store_config) == 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)? @@ -591,6 +601,18 @@ pub async fn delete_datastore( let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; let to_stdout = rpcenv.env_type() == RpcEnvironmentType::CLI; + 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.clone() + ), + ) + .await; + }; let upid = WorkerTask::new_thread( "delete-datastore", @@ -610,6 +632,21 @@ pub async fn delete_datastore( warn!("failed to notify after datastore removal: {err}"); } + // cleanup for removable datastores + // - unmount + // - remove mount dir, if destroy_data + if store_config.backing_device.is_some() { + let mount_point = store_config.absolute_path(); + if get_datastore_mount_status(&store_config) == Some(true) { + let _ = unmount_by_mountpoint(Path::new(&mount_point)) + .inspect_err(|e| warn!("could not unmount device after deletion: {e}")); + } + if destroy_data { + let _ = std::fs::remove_dir(&mount_point) + .inspect_err(|e| warn!("could not remove directory after deletion: {e}")); + } + } + Ok(()) }, )?; -- 2.39.5 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel