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

Refactor: separate delete and insert account index stats (#25800) 

* fix double count of account index del stats

* refactor to seperate delete and insert account index stats

* fix test

* increase test timing tolerance for bucket age

* Revert "increase test timing tolerance for bucket age"

This reverts commit 2b91cf902208e4585d25dff1d4298d412c9da516.
This commit is contained in:
HaoranYi 2022-06-08 09:05:37 -05:00 committed by GitHub
parent 08cb3c4c86
commit 28142f8a6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
runtime/src/bucket_map_holder_stats.rs
View File

@ -67,29 +67,34 @@ impl BucketMapHolderStats {
}
}
pub fn insert_or_delete(&self, insert: bool, _bin: usize) {
if insert {
self.inserts.fetch_add(1, Ordering::Relaxed);
self.count.fetch_add(1, Ordering::Relaxed);
} else {
self.deletes.fetch_add(1, Ordering::Relaxed);
self.count.fetch_sub(1, Ordering::Relaxed);
}
pub fn inc_insert(&self, _bin: usize) {
self.inserts.fetch_add(1, Ordering::Relaxed);
self.count.fetch_add(1, Ordering::Relaxed);
}
pub fn insert_or_delete_mem(&self, insert: bool, bin: usize) {
self.insert_or_delete_mem_count(insert, bin, 1)
pub fn inc_delete(&self, _bin: usize) {
self.deletes.fetch_add(1, Ordering::Relaxed);
self.count.fetch_sub(1, Ordering::Relaxed);
}
pub fn insert_or_delete_mem_count(&self, insert: bool, bin: usize, count: usize) {
pub fn inc_mem_count(&self, bin: usize) {
self.add_mem_count(bin, 1);
}
pub fn dec_mem_count(&self, bin: usize) {
self.sub_mem_count(bin, 1);
}
pub fn add_mem_count(&self, bin: usize, count: usize) {
let per_bucket = self.per_bucket_count.get(bin);
if insert {
self.count_in_mem.fetch_add(count, Ordering::Relaxed);
per_bucket.map(|stat| stat.fetch_add(count, Ordering::Relaxed));
} else {
self.count_in_mem.fetch_sub(count, Ordering::Relaxed);
per_bucket.map(|stat| stat.fetch_sub(count, Ordering::Relaxed));
}
self.count_in_mem.fetch_add(count, Ordering::Relaxed);
per_bucket.map(|stat| stat.fetch_add(count, Ordering::Relaxed));
}
pub fn sub_mem_count(&self, bin: usize, count: usize) {
let per_bucket = self.per_bucket_count.get(bin);
self.count_in_mem.fetch_sub(count, Ordering::Relaxed);
per_bucket.map(|stat| stat.fetch_sub(count, Ordering::Relaxed));
}
fn ms_per_age<T: IndexValue>(&self, storage: &BucketMapHolder<T>, elapsed_ms: u64) -> u64 {

22
runtime/src/in_mem_accounts_index.rs
View File

@ -247,7 +247,7 @@ impl<T: IndexValue> InMemAccountsIndex<T> {
let (add_to_cache, rt) = callback(Some(&disk_entry));
if add_to_cache {
stats.insert_or_delete_mem(true, self.bin);
stats.inc_mem_count(self.bin);
vacant.insert(disk_entry);
}
rt
@ -259,7 +259,7 @@ impl<T: IndexValue> InMemAccountsIndex<T> {
fn remove_if_slot_list_empty_value(&self, slot_list: SlotSlice<T>) -> bool {
if slot_list.is_empty() {
self.stats().insert_or_delete(false, self.bin);
self.stats().inc_delete(self.bin);
true
} else {
false
@ -408,7 +408,7 @@ impl<T: IndexValue> InMemAccountsIndex<T> {
previous_slot_entry_was_cached,
);
if !already_existed {
self.stats().insert_or_delete(true, self.bin);
self.stats().inc_insert(self.bin);
}
} else {
// go to in-mem cache first
@ -425,12 +425,12 @@ impl<T: IndexValue> InMemAccountsIndex<T> {
disk_entry
} else {
// not on disk, so insert new thing
self.stats().insert_or_delete(true, self.bin);
self.stats().inc_insert(self.bin);
new_value.into_account_map_entry(&self.storage)
};
assert!(new_value.dirty());
vacant.insert(new_value);
self.stats().insert_or_delete_mem(true, self.bin);
self.stats().inc_mem_count(self.bin);
}
}
}
@ -623,7 +623,7 @@ impl<T: IndexValue> InMemAccountsIndex<T> {
(false, already_existed)
} else {
let disk_entry = self.load_account_entry_from_disk(vacant.key());
self.stats().insert_or_delete_mem(true, self.bin);
self.stats().inc_mem_count(self.bin);
if let Some(disk_entry) = disk_entry {
let (slot, account_info) = new_entry.into();
InMemAccountsIndex::lock_and_update_slot_list(
@ -655,7 +655,7 @@ impl<T: IndexValue> InMemAccountsIndex<T> {
self.update_entry_stats(m, found_in_mem);
let stats = self.stats();
if !already_existed {
stats.insert_or_delete(true, self.bin);
stats.inc_insert(self.bin);
} else {
Self::update_stat(&stats.updates_in_mem, 1);
}
@ -706,7 +706,7 @@ impl<T: IndexValue> InMemAccountsIndex<T> {
existed
} else {
// not using disk, so insert into mem
self.stats().insert_or_delete_mem(true, self.bin);
self.stats().inc_mem_count(self.bin);
let new_entry: AccountMapEntry<T> = new_entry.into_account_map_entry(&self.storage);
assert!(new_entry.dirty());
vacant.insert(new_entry);
@ -863,8 +863,7 @@ impl<T: IndexValue> InMemAccountsIndex<T> {
}
}
}
self.stats()
.insert_or_delete_mem_count(true, self.bin, added_to_mem);
self.stats().add_mem_count(self.bin, added_to_mem);
Self::update_time_stat(&self.stats().get_range_us, m);
}
@ -1208,8 +1207,7 @@ impl<T: IndexValue> InMemAccountsIndex<T> {
map.shrink_to_fit();
}
}
self.stats()
.insert_or_delete_mem_count(false, self.bin, evicted);
self.stats().sub_mem_count(self.bin, evicted);
Self::update_stat(&self.stats().flush_entries_evicted_from_mem, evicted as u64);
Self::update_stat(&self.stats().failed_to_evict, failed as u64);
}