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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id A562DD228 for ; Thu, 17 Aug 2023 18:46:43 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8F509328CC for ; Thu, 17 Aug 2023 18:46:43 +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 for ; Thu, 17 Aug 2023 18:46:42 +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 E263042127 for ; Thu, 17 Aug 2023 18:46:41 +0200 (CEST) From: Max Carrara To: pbs-devel@lists.proxmox.com Date: Thu, 17 Aug 2023 18:46:37 +0200 Message-Id: <20230817164637.1286178-1-m.carrara@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.009 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. [runtime.rs] Subject: [pbs-devel] [PATCH proxmox] async: runtime: fix `block_in_place` panicking in wrong runtime 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: Thu, 17 Aug 2023 16:46:43 -0000 Because `tokio::task::block_in_place` panics if called in the "current_thread" runtime, so does our wrapper function. This is fixed by checking whether we're actually in a multithreaded tokio runtime. Signed-off-by: Max Carrara --- proxmox-async/src/runtime.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/proxmox-async/src/runtime.rs b/proxmox-async/src/runtime.rs index 0fe9fae..35cf7c3 100644 --- a/proxmox-async/src/runtime.rs +++ b/proxmox-async/src/runtime.rs @@ -15,7 +15,12 @@ thread_local! { } fn is_in_tokio() -> bool { - tokio::runtime::Handle::try_current().is_ok() + tokio::runtime::Handle::try_current().is_ok_and(|rt_handle| { + matches!( + rt_handle.runtime_flavor(), + tokio::runtime::RuntimeFlavor::MultiThread + ) + }) } fn is_blocking() -> bool { -- 2.39.2