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

perf: skip lockfile exist checking when disable-lock enabled #13355

Merged
merged 2 commits into from
Dec 14, 2024
Merged

perf: skip lockfile exist checking when disable-lock enabled #13355

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7aa559
perf: skip lockfile exist checking when disable-lock enabled
keroro520 Dec 12, 2024
8df8909
chore: make fmt
keroro520 Dec 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions crates/storage/db/src/lockfile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
#![cfg_attr(feature = "disable-lock", allow(dead_code))]

use reth_storage_errors::lockfile::StorageLockError;
use reth_tracing::tracing::error;
use std::{
path::{Path, PathBuf},
process,
Expand Down Expand Up @@ -47,7 +46,7 @@ impl StorageLock {
let file_path = path.join(LOCKFILE_NAME);
if let Some(process_lock) = ProcessUID::parse(&file_path)? {
if process_lock.pid != (process::id() as usize) && process_lock.is_active() {
error!(
reth_tracing::tracing::error!(
target: "reth::db::lockfile",
path = ?file_path,
pid = process_lock.pid,
Expand All @@ -64,12 +63,14 @@ impl StorageLock {

impl Drop for StorageLock {
fn drop(&mut self) {
// The lockfile is not created in disable-lock mode, so we don't need to delete it.
#[cfg(not(feature = "disable-lock"))]
if Arc::strong_count(&self.0) == 1 && self.0.file_path.exists() {
// TODO: should only happen during tests that the file does not exist: tempdir is
// getting dropped first. However, tempdir shouldn't be dropped
// before any of the storage providers.
if let Err(err) = reth_fs_util::remove_file(&self.0.file_path) {
error!(%err, "Failed to delete lock file");
reth_tracing::tracing::error!(%err, "Failed to delete lock file");
}
}
}
Expand Down
Loading