github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-02-19 03:04:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(libmdbx): handle errors gracefully in TransactionInner::drop (#21368)

Browse Source
This commit is contained in:
Georgios Konstantopoulos
2026-01-23 08:37:15 -08:00
committed by GitHub
parent d3846d98a9
commit fcef82261d
1 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
crates/storage/libmdbx-rs/src/transaction.rs
View File

@@ -339,26 +339,31 @@ where
fn drop(&mut self) {
// To be able to abort a timed out transaction, we need to renew it first.
// Hence the usage of `txn_execute_renew_on_timeout` here.
self.txn
.txn_execute_renew_on_timeout(|txn| {
if !self.has_committed() {
if K::IS_READ_ONLY {
#[cfg(feature = "read-tx-timeouts")]
self.env.txn_manager().remove_active_read_transaction(txn);
//
// We intentionally ignore errors here because Drop should never panic.
// MDBX can return errors (e.g., MDBX_PANIC) during abort if the environment
// is in a fatal state, but panicking in Drop can cause double-panics during
// unwinding which terminates the process.
let _ = self.txn.txn_execute_renew_on_timeout(|txn| {
if !self.has_committed() {
if K::IS_READ_ONLY {
#[cfg(feature = "read-tx-timeouts")]
self.env.txn_manager().remove_active_read_transaction(txn);
unsafe {
ffi::mdbx_txn_abort(txn);
}
} else {
let (sender, rx) = sync_channel(0);
self.env
.txn_manager()
.send_message(TxnManagerMessage::Abort { tx: TxnPtr(txn), sender });
rx.recv().unwrap().unwrap();
unsafe {
ffi::mdbx_txn_abort(txn);
}
} else {
let (sender, rx) = sync_channel(0);
self.env
.txn_manager()
.send_message(TxnManagerMessage::Abort { tx: TxnPtr(txn), sender });
if let Ok(Err(e)) = rx.recv() {
tracing::error!(target: "libmdbx", %e, "failed to abort transaction in drop");
}
}
})
.unwrap();
}
});
}
}