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 ACF2663BDA for ; Thu, 27 Jan 2022 11:56:03 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A26D221592 for ; Thu, 27 Jan 2022 11:56:03 +0100 (CET) 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 4C2AF21561 for ; Thu, 27 Jan 2022 11:56:02 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 18F6B46CCE for ; Thu, 27 Jan 2022 11:56:02 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Thu, 27 Jan 2022 11:55:55 +0100 Message-Id: <20220127105601.2741602-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220127105601.2741602-1-d.csapak@proxmox.com> References: <20220127105601.2741602-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.161 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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: [pve-devel] [PATCH proxmox-backup 2/5] restore-daemon: put blocking code into 'block_in_place' X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jan 2022 10:56:03 -0000 DISK_STATE.lock() and '.resolve()' can both block since they access the disks. Putting them into a 'block_in_place' tells tokio that this blocks an it can act accordingly Signed-off-by: Dominik Csapak --- .../src/proxmox_restore_daemon/api.rs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/proxmox-restore-daemon/src/proxmox_restore_daemon/api.rs b/proxmox-restore-daemon/src/proxmox_restore_daemon/api.rs index 4c755210..0c89fd82 100644 --- a/proxmox-restore-daemon/src/proxmox_restore_daemon/api.rs +++ b/proxmox-restore-daemon/src/proxmox_restore_daemon/api.rs @@ -145,8 +145,10 @@ fn list( let path_str = OsStr::from_bytes(&path[..]); let param_path_buf = Path::new(path_str); - let mut disk_state = crate::DISK_STATE.lock().unwrap(); - let query_result = disk_state.resolve(param_path_buf)?; + let query_result = proxmox_async::runtime::block_in_place(move || { + let mut disk_state = crate::DISK_STATE.lock().unwrap(); + disk_state.resolve(param_path_buf) + })?; match query_result { ResolveResult::Path(vm_path) => { @@ -269,10 +271,10 @@ fn extract( let pxar = param["pxar"].as_bool().unwrap_or(true); - let query_result = { + let query_result = proxmox_async::runtime::block_in_place(move || { let mut disk_state = crate::DISK_STATE.lock().unwrap(); - disk_state.resolve(path)? - }; + disk_state.resolve(path) + })?; let vm_path = match query_result { ResolveResult::Path(vm_path) => vm_path, -- 2.30.2