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 DE2047493E for ; Wed, 2 Jun 2021 13:27:40 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D3F9EA670 for ; Wed, 2 Jun 2021 13:27:10 +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 id E4E26A644 for ; Wed, 2 Jun 2021 13:27:05 +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 BCB6B40677 for ; Wed, 2 Jun 2021 13:27:05 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Wed, 2 Jun 2021 13:27:01 +0200 Message-Id: <20210602112704.893-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210602112704.893-1-d.csapak@proxmox.com> References: <20210602112704.893-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.046 Adjusted score from AWL reputation of From: address 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. [proxmox-backup-proxy.rs, datastore.rs, server.rs] Subject: [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: Wed, 02 Jun 2021 11:27:40 -0000 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(()) +} -- 2.20.1