From: Max Carrara <m.carrara@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox] async: runtime: fix `block_in_place` panicking in wrong runtime
Date: Thu, 17 Aug 2023 18:46:37 +0200 [thread overview]
Message-ID: <20230817164637.1286178-1-m.carrara@proxmox.com> (raw)
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 <m.carrara@proxmox.com>
---
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
next reply other threads:[~2023-08-17 16:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-17 16:46 Max Carrara [this message]
2023-08-18 7:26 ` Wolfgang Bumiller
2023-08-18 9:57 ` Max Carrara
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230817164637.1286178-1-m.carrara@proxmox.com \
--to=m.carrara@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.