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 3639474DFD for ; Fri, 4 Jun 2021 08:24:47 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 249421936E for ; Fri, 4 Jun 2021 08:24:17 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id C53CA19360 for ; Fri, 4 Jun 2021 08:24:15 +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 91761422EB for ; Fri, 4 Jun 2021 08:24:09 +0200 (CEST) To: Proxmox Backup Server development discussion , Dominik Csapak References: <20210602112704.893-1-d.csapak@proxmox.com> <20210602112704.893-2-d.csapak@proxmox.com> From: Dietmar Maurer Message-ID: <3ed2f57f-c42b-614a-62fb-19108ad9a299@proxmox.com> Date: Fri, 4 Jun 2021 08:24:08 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.0 MIME-Version: 1.0 In-Reply-To: <20210602112704.893-2-d.csapak@proxmox.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US X-SPAM-LEVEL: Spam detection results: 0 AWL 0.507 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.603 Looks like a legit reply (A) 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. [server.rs, proxmox-backup-proxy.rs, datastore.rs] Subject: Re: [pbs-devel] [PATCH proxmox-backup v2 1/4] proxmox-backup-proxy: fix leftover references on datastore removal 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: Fri, 04 Jun 2021 06:24:47 -0000 applied with small modifications - simplify refresh_datastores (as suggested by Thomas) - rename  refresh_datastores to remove_unused_datastores On 6/2/21 1:27 PM, Dominik Csapak wrote: > when we remove a datastore via api/cli, the proxy > has sometimes leftover references to that datastore in its > DATASTORE_MAP which includes an open filehandle on the > '.lock' file > > this prevents unmounting/exporting the datastore even after removal, > only a reload/restart of the proxy did help > > add a command to our command socket, which removes all non > configured datastores from the map, dropping the open filehandle > > Signed-off-by: Dominik Csapak > --- > src/api2/config/datastore.rs | 4 +++- > src/backup/datastore.rs | 16 ++++++++++++++++ > src/bin/proxmox-backup-proxy.rs | 11 +++++++++++ > src/server.rs | 8 ++++++++ > 4 files changed, 38 insertions(+), 1 deletion(-) > > diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs > index 6ca98b53..7299c91d 100644 > --- a/src/api2/config/datastore.rs > +++ b/src/api2/config/datastore.rs > @@ -403,7 +403,7 @@ pub fn update_datastore( > }, > )] > /// Remove a datastore configuration. > -pub fn delete_datastore(name: String, digest: Option) -> Result<(), Error> { > +pub async fn delete_datastore(name: String, digest: Option) -> Result<(), Error> { > > let _lock = open_file_locked(datastore::DATASTORE_CFG_LOCKFILE, std::time::Duration::new(10, 0), true)?; > > @@ -425,6 +425,8 @@ pub fn delete_datastore(name: String, digest: Option) -> Result<(), Erro > let _ = jobstate::remove_state_file("prune", &name); > let _ = jobstate::remove_state_file("garbage_collection", &name); > > + crate::server::notify_datastore_removed().await?; > + > Ok(()) > } > > diff --git a/src/backup/datastore.rs b/src/backup/datastore.rs > index 584b2020..6989313d 100644 > --- a/src/backup/datastore.rs > +++ b/src/backup/datastore.rs > @@ -69,6 +69,22 @@ impl DataStore { > Ok(datastore) > } > > + /// removes all datastores that are not configured anymore > + pub fn refresh_datastores() -> Result<(), Error>{ > + let (config, _digest) = datastore::config()?; > + let mut stores = HashSet::new(); > + for (store, _) in config.sections { > + stores.insert(store); > + } > + > + let mut map = DATASTORE_MAP.lock().unwrap(); > + // removes all elements that are not in the config > + map.retain(|key, _| { > + stores.contains(key) > + }); > + Ok(()) > + } > + > fn open_with_path(store_name: &str, path: &Path, config: DataStoreConfig) -> Result { > let chunk_store = ChunkStore::open(store_name, path)?; > > diff --git a/src/bin/proxmox-backup-proxy.rs b/src/bin/proxmox-backup-proxy.rs > index a53f554a..75d40e21 100644 > --- a/src/bin/proxmox-backup-proxy.rs > +++ b/src/bin/proxmox-backup-proxy.rs > @@ -136,6 +136,17 @@ async fn run() -> Result<(), Error> { > }, > )?; > > + // to remove references for not configured datastores > + commando_sock.register_command( > + "datastore-removed".to_string(), > + |_value| { > + if let Err(err) = proxmox_backup::backup::DataStore::refresh_datastores() { > + log::error!("could not refresh datastores: {}", err); > + } > + Ok(Value::Null) > + } > + )?; > + > let server = daemon::create_daemon( > ([0,0,0,0,0,0,0,0], 8007).into(), > move |listener, ready| { > diff --git a/src/server.rs b/src/server.rs > index ba25617d..c4a36967 100644 > --- a/src/server.rs > +++ b/src/server.rs > @@ -100,3 +100,11 @@ pub(crate) async fn reload_proxy_certificate() -> Result<(), Error> { > .await?; > Ok(()) > } > + > +pub(crate) async fn notify_datastore_removed() -> Result<(), Error> { > + let proxy_pid = crate::server::read_pid(buildcfg::PROXMOX_BACKUP_PROXY_PID_FN)?; > + let sock = crate::server::ctrl_sock_from_pid(proxy_pid); > + let _: Value = crate::server::send_raw_command(sock, "{\"command\":\"datastore-removed\"}\n") > + .await?; > + Ok(()) > +}