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

coalesce purge stats and reclaim result (#25183)

This commit is contained in:
apfitzge 2022-05-13 12:34:11 -05:00 committed by GitHub
parent e493e0033a
commit 5eeb07fead
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
runtime/src/accounts_db.rs
View File

@ -1847,8 +1847,7 @@ impl AccountsDb {
self.handle_reclaims(
&reclaims,
None,
Some(&self.clean_accounts_stats.purge_stats),
Some(&mut reclaim_result),
Some((&self.clean_accounts_stats.purge_stats, &mut reclaim_result)),
reset_accounts,
);
measure.stop();
@ -2396,12 +2395,10 @@ impl AccountsDb {
// and those stores may be used for background hashing.
let reset_accounts = false;
let mut reclaim_result = ReclaimResult::default();
let reclaim_result = Some(&mut reclaim_result);
self.handle_reclaims(
&reclaims,
None,
Some(&self.clean_accounts_stats.purge_stats),
reclaim_result,
Some((&self.clean_accounts_stats.purge_stats, &mut reclaim_result)),
reset_accounts,
);
@ -2509,15 +2506,15 @@ impl AccountsDb {
/// from store or slot shrinking, as those should only touch the slot they are
/// currently storing to or shrinking.
///
/// * `purge_stats` - The stats used to track performance of purging dead slots. This
/// also serves a correctness assertion. If `purge_stats.is_none()`, this implies
/// there can be no dead slots that happen as a result of this call, and the function
/// will check that no slots are cleaned up/removed via `process_dead_slots`. For instance,
/// on store, no slots should be cleaned up, but during the background clean accounts
/// purges accounts from old rooted slots, so outdated slots may be removed.
///
/// * `reclaim_result` - Information about accounts that were removed from storage, does
/// not include accounts that were removed from the cache
/// * `purge_stats_and_reclaim_result` - Option containing `purge_stats` and `reclaim_result`.
/// `purge_stats`. `purge_stats` are stats used to track performance of purging dead slots.
/// `reclaim_result` contains information about accounts that were removed from storage,
/// does not include accounts that were removed from the cache.
/// If `purge_stats_and_reclaim_result.is_none()`, this implies there can be no dead slots
/// that happen as a result of this call, and the function will check that no slots are
/// cleaned up/removed via `process_dead_slots`. For instance, on store, no slots should
/// be cleaned up, but during the background clean accounts purges accounts from old rooted
/// slots, so outdated slots may be removed.
///
/// * `reset_accounts` - Reset the append_vec store when the store is dead (count==0)
/// From the clean and shrink paths it should be false since there may be an in-progress
@ -2526,38 +2523,44 @@ impl AccountsDb {
&self,
reclaims: SlotSlice<AccountInfo>,
expected_single_dead_slot: Option<Slot>,
// TODO: coalesce `purge_stats` and `reclaim_result` together into one option, as they
// are both either Some or None
purge_stats: Option<&PurgeStats>,
reclaim_result: Option<&mut ReclaimResult>,
purge_stats_and_reclaim_result: Option<(&PurgeStats, &mut ReclaimResult)>,
reset_accounts: bool,
) {
if reclaims.is_empty() {
return;
}
let (purged_account_slots, reclaimed_offsets) =
if let Some((ref mut x, ref mut y)) = reclaim_result {
(Some(x), Some(y))
let (purge_stats, purged_account_slots, reclaimed_offsets) =
if let Some((purge_stats, (ref mut purged_account_slots, ref mut reclaimed_offsets))) =
purge_stats_and_reclaim_result
{
(
Some(purge_stats),
Some(purged_account_slots),
Some(reclaimed_offsets),
)
} else {
(None, None)
(None, None, None)
};
let dead_slots = self.remove_dead_accounts(
reclaims,
expected_single_dead_slot,
reclaimed_offsets,
reset_accounts,
);
if purge_stats.is_none() {
assert!(dead_slots.is_empty());
} else if let Some(expected_single_dead_slot) = expected_single_dead_slot {
assert!(dead_slots.len() <= 1);
if dead_slots.len() == 1 {
assert!(dead_slots.contains(&expected_single_dead_slot));
}
}
if let Some(purge_stats) = purge_stats {
if let Some(expected_single_dead_slot) = expected_single_dead_slot {
assert!(dead_slots.len() <= 1);
if dead_slots.len() == 1 {
assert!(dead_slots.contains(&expected_single_dead_slot));
}
}
self.process_dead_slots(&dead_slots, purged_account_slots, purge_stats);
} else {
assert!(dead_slots.is_empty());
}
}
@ -4365,8 +4368,7 @@ impl AccountsDb {
self.handle_reclaims(
&reclaims,
expected_dead_slot,
Some(purge_stats),
Some(&mut ReclaimResult::default()),
Some((purge_stats, &mut ReclaimResult::default())),
false,
);
handle_reclaims_elapsed.stop();
@ -6852,15 +6854,8 @@ impl AccountsDb {
//
// From 1) and 2) we guarantee passing `no_purge_stats` == None, which is
// equivalent to asserting there will be no dead slots, is safe.
let no_purge_stats = None;
let mut handle_reclaims_time = Measure::start("handle_reclaims");
self.handle_reclaims(
&reclaims,
expected_single_dead_slot,
no_purge_stats,
None,
reset_accounts,
);
self.handle_reclaims(&reclaims, expected_single_dead_slot, None, reset_accounts);
handle_reclaims_time.stop();
self.stats
.store_handle_reclaims