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 BC414976F0 for ; Wed, 17 Apr 2024 10:35:19 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9D92578E for ; Wed, 17 Apr 2024 10:34:49 +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 ; Wed, 17 Apr 2024 10:34:49 +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 C387F41B38 for ; Wed, 17 Apr 2024 10:34:48 +0200 (CEST) Message-ID: <97ac5e2e-a056-4fa2-bf53-6f05fce4da3d@proxmox.com> Date: Wed, 17 Apr 2024 10:34:47 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: Proxmox Backup Server development discussion , Hannes Laimer References: <20240416152416.96561-1-h.laimer@proxmox.com> <20240416152416.96561-14-h.laimer@proxmox.com> Content-Language: en-US, de-DE From: Christian Ebner In-Reply-To: <20240416152416.96561-14-h.laimer@proxmox.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.032 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [datastore.rs] Subject: Re: [pbs-devel] [PATCH proxmox-backup v4 13/22] 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: Wed, 17 Apr 2024 08:35:19 -0000 nit inline On 4/16/24 17:24, Hannes Laimer wrote: > Signed-off-by: Hannes Laimer > --- > pbs-datastore/src/datastore.rs | 10 ++++++---- > src/api2/config/datastore.rs | 14 ++++++++++++++ > 2 files changed, 20 insertions(+), 4 deletions(-) > > diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs > index ff2ca95f..70324a01 100644 > --- a/pbs-datastore/src/datastore.rs > +++ b/pbs-datastore/src/datastore.rs > @@ -1504,10 +1504,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 3a075674..5729071d 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: { > @@ -531,6 +533,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, > + "can't destroy data on '{name}' unless the datastore is mounted" nit: s/can't/cannot > + ); > + } > + > if !keep_job_configs { > for job in list_verification_jobs(Some(name.clone()), Value::Null, rpcenv)? { > delete_verification_job(job.config.id, None, rpcenv)? > @@ -569,6 +579,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())