jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

test(storage): make read transaction safety tests faster (#6994)

Browse Source
This commit is contained in:
Alexey Shekhirin
2024-03-06 10:58:11 +00:00
committed by GitHub
parent 56376b9bdc
commit 588c2f2e6a
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
crates/storage/db/src/implementation/mdbx/tx.rs
View File

@ -183,6 +183,8 @@ struct MetricsHandler<K: TransactionKind> {
txn_id: u64,
/// The time when transaction has started.
start: Instant,
/// Duration after which we emit the log about long-lived database transactions.
long_transaction_duration: Duration,
/// If `true`, the metric about transaction closing has already been recorded and we don't need
/// to do anything on [Drop::drop].
close_recorded: bool,
@ -201,6 +203,7 @@ impl<K: TransactionKind> MetricsHandler<K> {
Self {
txn_id,
start: Instant::now(),
long_transaction_duration: LONG_TRANSACTION_DURATION,
close_recorded: false,
record_backtrace: true,
backtrace_recorded: AtomicBool::new(false),
@ -241,7 +244,7 @@ impl<K: TransactionKind> MetricsHandler<K> {
self.transaction_mode().is_read_only()
{
let open_duration = self.start.elapsed();
if open_duration > LONG_TRANSACTION_DURATION {
if open_duration > self.long_transaction_duration {
self.backtrace_recorded.store(true, Ordering::Relaxed);
warn!(
target: "storage::db::mdbx",
@ -389,11 +392,8 @@ impl DbTxMut for Tx<RW> {
#[cfg(test)]
mod tests {
use crate::{
database::Database,
mdbx::{tx::LONG_TRANSACTION_DURATION, DatabaseArguments},
tables,
transaction::DbTx,
DatabaseEnv, DatabaseEnvKind,
database::Database, mdbx::DatabaseArguments, tables, transaction::DbTx, DatabaseEnv,
DatabaseEnvKind,
};
use reth_interfaces::db::DatabaseError;
use reth_libmdbx::MaxReadTransactionDuration;
@ -410,8 +410,9 @@ mod tests {
let db = DatabaseEnv::open(dir.path(), DatabaseEnvKind::RW, args).unwrap().with_metrics();
let mut tx = db.tx().unwrap();
tx.metrics_handler.as_mut().unwrap().long_transaction_duration = MAX_DURATION;
tx.disable_long_read_transaction_safety();
sleep(MAX_DURATION.max(LONG_TRANSACTION_DURATION));
sleep(MAX_DURATION);
assert_eq!(
tx.get::<tables::Transactions>(0).err(),
@ -430,8 +431,9 @@ mod tests {
.max_read_transaction_duration(Some(MaxReadTransactionDuration::Set(MAX_DURATION)));
let db = DatabaseEnv::open(dir.path(), DatabaseEnvKind::RW, args).unwrap().with_metrics();
let tx = db.tx().unwrap();
sleep(MAX_DURATION.max(LONG_TRANSACTION_DURATION));
let mut tx = db.tx().unwrap();
tx.metrics_handler.as_mut().unwrap().long_transaction_duration = MAX_DURATION;
sleep(MAX_DURATION);
assert_eq!(
tx.get::<tables::Transactions>(0).err(),