blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

DiskIdx: reuse disk bucket file if possible (#33379)

This commit is contained in:
Jeff Washington (jwash) 2023-09-22 17:25:21 -07:00 committed by GitHub
parent 1840fd7ab3
commit e92d90b674
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
bucket_map/src/bucket.rs
View File

@ -19,7 +19,9 @@ use {
solana_sdk::pubkey::Pubkey,
std::{
collections::hash_map::DefaultHasher,
fs,
hash::{Hash, Hasher},
num::NonZeroU64,
ops::RangeBounds,
path::PathBuf,
sync::{
@ -119,18 +121,44 @@ impl<'b, T: Clone + Copy + PartialEq + std::fmt::Debug + 'static> Bucket<T> {
max_search: MaxSearch,
stats: Arc<BucketMapStats>,
count: Arc<AtomicU64>,
restartable_bucket: RestartableBucket,
mut restartable_bucket: RestartableBucket,
) -> Self {
let (index, _file_name) = BucketStorage::new(
Arc::clone(&drives),
1,
std::mem::size_of::<IndexEntry<T>>() as u64,
max_search,
Arc::clone(&stats.index),
count,
);
stats.index.resize_grow(0, index.capacity_bytes());
let random = thread_rng().gen();
let reuse_path = std::mem::take(&mut restartable_bucket.path);
let elem_size = NonZeroU64::new(std::mem::size_of::<IndexEntry<T>>() as u64).unwrap();
let (index, random) = reuse_path
.and_then(|path| {
// try to re-use the file this bucket was using last time we were running
restartable_bucket.get().and_then(|(_file_name, random)| {
let result = BucketStorage::load_on_restart(
path.clone(),
elem_size,
max_search,
Arc::clone(&stats.index),
count.clone(),
)
.map(|index| (index, random));
if result.is_none() {
// we couldn't re-use it, so delete it
_ = fs::remove_file(path);
}
result
})
})
.unwrap_or_else(|| {
// no file to re-use, so create a new file
let (index, file_name) = BucketStorage::new(
Arc::clone(&drives),
1,
elem_size.into(),
max_search,
Arc::clone(&stats.index),
count,
);
stats.index.resize_grow(0, index.capacity_bytes());
let random = thread_rng().gen();
restartable_bucket.set_file(file_name, random);
(index, random)
});
Self {
random,