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

clean stats on acct idx lookup (#20632)

This commit is contained in:
Jeff Washington (jwash) 2021-10-14 08:37:42 -05:00 committed by GitHub
parent c43b6e0248
commit 7eead4e25f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
runtime/src/accounts_db.rs
View File

@ -2002,6 +2002,10 @@ impl AccountsDb {
let total_keys_count = pubkeys.len(); let total_keys_count = pubkeys.len();
let mut accounts_scan = Measure::start("accounts_scan"); let mut accounts_scan = Measure::start("accounts_scan");
let uncleaned_roots_len = self.accounts_index.uncleaned_roots_len(); let uncleaned_roots_len = self.accounts_index.uncleaned_roots_len();
let found_not_zero_accum = AtomicU64::new(0);
let not_found_on_fork_accum = AtomicU64::new(0);
let missing_accum = AtomicU64::new(0);
// parallel scan the index. // parallel scan the index.
let (mut purges_zero_lamports, purges_old_accounts) = { let (mut purges_zero_lamports, purges_old_accounts) = {
let do_clean_scan = || { let do_clean_scan = || {
@ -2010,6 +2014,9 @@ impl AccountsDb {
.map(|pubkeys: &[Pubkey]| { .map(|pubkeys: &[Pubkey]| {
let mut purges_zero_lamports = HashMap::new(); let mut purges_zero_lamports = HashMap::new();
let mut purges_old_accounts = Vec::new(); let mut purges_old_accounts = Vec::new();
let mut found_not_zero = 0;
let mut not_found_on_fork = 0;
let mut missing = 0;
for pubkey in pubkeys { for pubkey in pubkeys {
match self.accounts_index.get(pubkey, None, max_clean_root) { match self.accounts_index.get(pubkey, None, max_clean_root) {
AccountIndexGetResult::Found(locked_entry, index) => { AccountIndexGetResult::Found(locked_entry, index) => {
@ -2021,6 +2028,8 @@ impl AccountsDb {
self.accounts_index self.accounts_index
.roots_and_ref_count(&locked_entry, max_clean_root), .roots_and_ref_count(&locked_entry, max_clean_root),
); );
} else {
found_not_zero += 1;
} }
// Release the lock // Release the lock
let slot = *slot; let slot = *slot;
@ -2042,11 +2051,17 @@ impl AccountsDb {
// Also, this pubkey must have been touched by some slot since // Also, this pubkey must have been touched by some slot since
// it was in the dirty list, so we assume that the slot it was // it was in the dirty list, so we assume that the slot it was
// touched in must be unrooted. // touched in must be unrooted.
not_found_on_fork += 1;
purges_old_accounts.push(*pubkey); purges_old_accounts.push(*pubkey);
} }
AccountIndexGetResult::Missing(_lock) => {} AccountIndexGetResult::Missing(_lock) => {
missing += 1;
}
}; };
} }
found_not_zero_accum.fetch_add(found_not_zero, Ordering::Relaxed);
not_found_on_fork_accum.fetch_add(not_found_on_fork, Ordering::Relaxed);
missing_accum.fetch_add(missing, Ordering::Relaxed);
(purges_zero_lamports, purges_old_accounts) (purges_zero_lamports, purges_old_accounts)
}) })
.reduce( .reduce(
@ -2202,6 +2217,17 @@ impl AccountsDb {
("delta_key_count", key_timings.delta_key_count, i64), ("delta_key_count", key_timings.delta_key_count, i64),
("dirty_pubkeys_count", key_timings.dirty_pubkeys_count, i64), ("dirty_pubkeys_count", key_timings.dirty_pubkeys_count, i64),
("total_keys_count", total_keys_count, i64), ("total_keys_count", total_keys_count, i64),
(
"scan_found_not_zero",
found_not_zero_accum.load(Ordering::Relaxed),
i64
),
(
"scan_not_found_on_fork",
not_found_on_fork_accum.load(Ordering::Relaxed),
i64
),
("scan_missing", missing_accum.load(Ordering::Relaxed), i64),
("uncleaned_roots_len", uncleaned_roots_len, i64), ("uncleaned_roots_len", uncleaned_roots_len, i64),
( (
"clean_old_root_us", "clean_old_root_us",