rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-14 08:52:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixup(#7141 / tokio_epoll_uring_ext): high frequency log message (#7160)

Browse Source 
The PR #7141 added log message

```
ThreadLocalState is being dropped and id might be re-used in the future
```

which was supposed to be emitted when the thread-local is destroyed.
Instead, it was emitted on _each_ call to `thread_local_system()`,
ie.., on each tokio-epoll-uring operation.

Testing
-------

Reproduced the issue locally and verified that this PR fixes the issue.
This commit is contained in:
Christian Schwarz
2024-03-18 13:29:20 +01:00
committed by GitHub
parent 1d3ae57f18
commit db749914d8
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
pageserver/src/virtual_file/io_engine/tokio_epoll_uring_ext.rs
View File

@@ -6,7 +6,7 @@
//! See <https://github.com/neondatabase/neon/issues/6373#issuecomment-1905814391> for more details.
use std::sync::atomic::AtomicU32;
use std::sync::Arc;
use std::sync::{Arc, Weak};
use tokio_util::sync::CancellationToken;
use tracing::{error, info, info_span, warn, Instrument};
@@ -24,23 +24,36 @@ struct ThreadLocalState(Arc<ThreadLocalStateInner>);
struct ThreadLocalStateInner {
cell: tokio::sync::OnceCell<SystemHandle>,
launch_attempts: AtomicU32,
weak_self: Weak<ThreadLocalStateInner>,
}
impl ThreadLocalState {
pub fn new() -> Self {
Self(Arc::new(ThreadLocalStateInner {
Self(Arc::new_cyclic(|weak| ThreadLocalStateInner {
cell: tokio::sync::OnceCell::default(),
launch_attempts: AtomicU32::new(0),
weak_self: Weak::clone(weak),
}))
}
pub fn make_id_string(&self) -> String {
format!("0x{:p}", Arc::as_ptr(&self.0))
}
}
impl Drop for ThreadLocalState {
impl ThreadLocalStateInner {
pub fn make_id_string(&self) -> String {
format!("0x{:p}", self.weak_self.as_ptr())
}
}
impl Drop for ThreadLocalStateInner {
fn drop(&mut self) {
info!(parent: None, id=%self.make_id_string(), "tokio-epoll-uring_ext: ThreadLocalState is being dropped and id might be re-used in the future");
info!(parent: None, id=%self.make_id_string(), "tokio_epoll_uring_ext: thread-local state is being dropped and id might be re-used in the future");
}
}
impl std::ops::Deref for ThreadLocalState {
type Target = ThreadLocalStateInner;
fn deref(&self) -> &Self::Target {
&self.0
}
}