Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from Mar 6, 2024
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 11 additions & 9 deletions crates/storage/db/src/implementation/mdbx/tx.rs
View file
Open in desktop
Expand Up @@ -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,
Expand All @@ -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),
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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;
Expand All @@ -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(),
Expand All @@ -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(),
Expand Down