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

metric for 'ancient_account_cleans' (#26664)

This commit is contained in:
Jeff Washington (jwash) 2022-07-19 09:16:23 -05:00 committed by GitHub
parent 6efe7e095b
commit 738c4a79b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
runtime/src/accounts_db.rs
View File

@ -2149,6 +2149,7 @@ impl AccountsDb {
&self,
purges: Vec<Pubkey>,
max_clean_root: Option<Slot>,
ancient_account_cleans: &AtomicU64,
) -> ReclaimResult {
if purges.is_empty() {
return ReclaimResult::default();
@ -2157,6 +2158,8 @@ impl AccountsDb {
// the hot loop will be the order of ~Xms.
const INDEX_CLEAN_BULK_COUNT: usize = 4096;
let one_epoch_old = self.get_accounts_hash_complete_one_epoch_old();
let mut clean_rooted = Measure::start("clean_old_root-ms");
let reclaim_vecs = purges
.par_chunks(INDEX_CLEAN_BULK_COUNT)
@ -2166,7 +2169,15 @@ impl AccountsDb {
self.accounts_index
.clean_rooted_entries(pubkey, &mut reclaims, max_clean_root);
}
(!reclaims.is_empty()).then(|| reclaims)
(!reclaims.is_empty()).then(|| {
// figure out how many ancient accounts have been reclaimed
let old_reclaims = reclaims
.iter()
.filter_map(|(slot, _)| (slot < &one_epoch_old).then(|| 1))
.sum();
ancient_account_cleans.fetch_add(old_reclaims, Ordering::Relaxed);
reclaims
})
})
.collect::<Vec<_>>();
clean_rooted.stop();
@ -2505,6 +2516,8 @@ impl AccountsDb {
) {
let _guard = self.active_stats.activate(ActiveStatItem::Clean);
let ancient_account_cleans = AtomicU64::default();
let mut measure_all = Measure::start("clean_accounts");
let max_clean_root = self.max_clean_root(max_clean_root);
@ -2639,8 +2652,11 @@ impl AccountsDb {
accounts_scan.stop();
let mut clean_old_rooted = Measure::start("clean_old_roots");
let (purged_account_slots, removed_accounts) =
self.clean_accounts_older_than_root(purges_old_accounts, max_clean_root);
let (purged_account_slots, removed_accounts) = self.clean_accounts_older_than_root(
purges_old_accounts,
max_clean_root,
&ancient_account_cleans,
);
if self.caching_enabled {
self.do_reset_uncleaned_roots(max_clean_root);
@ -2851,6 +2867,11 @@ impl AccountsDb {
.swap(0, Ordering::Relaxed),
i64
),
(
"ancient_account_cleans",
ancient_account_cleans.load(Ordering::Relaxed),
i64
),
("next_store_id", self.next_id.load(Ordering::Relaxed), i64),
);
}