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

calc slot info on max slot once per hash calc (#25422)

This commit is contained in:
Jeff Washington (jwash) 2022-05-23 10:11:00 -05:00 committed by GitHub
parent 41f30a2383
commit bac05dc55a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
runtime/src/accounts_db.rs
View File

@ -47,7 +47,7 @@ use {
bank::Rewrites, bank::Rewrites,
cache_hash_data::CacheHashData, cache_hash_data::CacheHashData,
contains::Contains, contains::Contains,
expected_rent_collection::ExpectedRentCollection, expected_rent_collection::{ExpectedRentCollection, SlotInfoInEpoch},
pubkey_bins::PubkeyBinCalculator24, pubkey_bins::PubkeyBinCalculator24,
read_only_accounts_cache::ReadOnlyAccountsCache, read_only_accounts_cache::ReadOnlyAccountsCache,
rent_collector::RentCollector, rent_collector::RentCollector,
@ -5544,6 +5544,8 @@ impl AccountsDb {
let total_lamports = Mutex::<u64>::new(0); let total_lamports = Mutex::<u64>::new(0);
let stats = HashStats::default(); let stats = HashStats::default();
let max_slot_info = SlotInfoInEpoch::new(max_slot, config.epoch_schedule);
let get_hashes = || { let get_hashes = || {
keys.par_chunks(chunks) keys.par_chunks(chunks)
.map(|pubkeys| { .map(|pubkeys| {
@ -5588,7 +5590,7 @@ impl AccountsDb {
config.epoch_schedule, config.epoch_schedule,
config.rent_collector, config.rent_collector,
&stats, &stats,
max_slot, &max_slot_info,
find_unskipped_slot, find_unskipped_slot,
self.filler_account_suffix.as_ref(), self.filler_account_suffix.as_ref(),
); );
@ -6127,6 +6129,9 @@ impl AccountsDb {
let find_unskipped_slot = |slot: Slot| self.find_unskipped_slot(slot, config.ancestors); let find_unskipped_slot = |slot: Slot| self.find_unskipped_slot(slot, config.ancestors);
let max_slot_info =
SlotInfoInEpoch::new(storage.max_slot_inclusive(), config.epoch_schedule);
let result: Vec<BinnedHashData> = self.scan_account_storage_no_bank( let result: Vec<BinnedHashData> = self.scan_account_storage_no_bank(
cache_hash_data, cache_hash_data,
config, config,
@ -6158,7 +6163,7 @@ impl AccountsDb {
config.epoch_schedule, config.epoch_schedule,
config.rent_collector, config.rent_collector,
stats, stats,
storage.max_slot_inclusive(), &max_slot_info,
find_unskipped_slot, find_unskipped_slot,
filler_account_suffix, filler_account_suffix,
); );

51
runtime/src/expected_rent_collection.rs
View File

@ -236,7 +236,6 @@ pub struct SlotInfoInEpochInner {
impl SlotInfoInEpoch { impl SlotInfoInEpoch {
/// create, populating epoch info /// create, populating epoch info
#[allow(dead_code)]
pub fn new(slot: Slot, epoch_schedule: &EpochSchedule) -> Self { pub fn new(slot: Slot, epoch_schedule: &EpochSchedule) -> Self {
let mut result = Self::new_small(slot); let mut result = Self::new_small(slot);
result.epoch_info = Some(result.get_epoch_info(epoch_schedule)); result.epoch_info = Some(result.get_epoch_info(epoch_schedule));
@ -392,7 +391,7 @@ impl ExpectedRentCollection {
epoch_schedule: &EpochSchedule, epoch_schedule: &EpochSchedule,
rent_collector: &RentCollector, rent_collector: &RentCollector,
stats: &HashStats, stats: &HashStats,
max_slot_in_storages_inclusive: Slot, max_slot_in_storages_inclusive: &SlotInfoInEpoch,
find_unskipped_slot: impl Fn(Slot) -> Option<Slot>, find_unskipped_slot: impl Fn(Slot) -> Option<Slot>,
filler_account_suffix: Option<&Pubkey>, filler_account_suffix: Option<&Pubkey>,
) -> Option<Hash> { ) -> Option<Hash> {
@ -449,26 +448,26 @@ impl ExpectedRentCollection {
storage_slot: Slot, storage_slot: Slot,
epoch_schedule: &EpochSchedule, epoch_schedule: &EpochSchedule,
rent_collector_max_epoch: &RentCollector, rent_collector_max_epoch: &RentCollector,
max_slot_in_storages_inclusive: Slot, max_slot_in_storages_inclusive: &SlotInfoInEpoch,
find_unskipped_slot: impl Fn(Slot) -> Option<Slot>, find_unskipped_slot: impl Fn(Slot) -> Option<Slot>,
filler_account_suffix: Option<&Pubkey>, filler_account_suffix: Option<&Pubkey>,
) -> Option<Self> { ) -> Option<Self> {
let mut rent_collector = rent_collector_max_epoch; let mut rent_collector = rent_collector_max_epoch;
let slots_per_epoch_max_epoch = epoch_schedule.get_slots_in_epoch(rent_collector.epoch); let SlotInfoInEpochInner {
epoch: epoch_of_max_storage_slot,
partition_index: partition_index_from_max_slot,
slots_in_epoch: slots_per_epoch_max_epoch,
} = max_slot_in_storages_inclusive.get_epoch_info(epoch_schedule);
let mut partition_from_pubkey = let mut partition_from_pubkey =
crate::bank::Bank::partition_from_pubkey(pubkey, slots_per_epoch_max_epoch); crate::bank::Bank::partition_from_pubkey(pubkey, slots_per_epoch_max_epoch);
let (epoch_of_max_storage_slot, partition_index_from_max_slot) =
epoch_schedule.get_epoch_and_slot_index(max_slot_in_storages_inclusive);
// now, we have to find the root that is >= the slot where this pubkey's rent would have been collected // now, we have to find the root that is >= the slot where this pubkey's rent would have been collected
let first_slot_in_max_epoch = let first_slot_in_max_epoch =
max_slot_in_storages_inclusive - partition_index_from_max_slot; max_slot_in_storages_inclusive.slot - partition_index_from_max_slot;
let mut expected_rent_collection_slot_max_epoch = let mut expected_rent_collection_slot_max_epoch =
first_slot_in_max_epoch + partition_from_pubkey; first_slot_in_max_epoch + partition_from_pubkey;
let calculated_from_index_expected_rent_collection_slot_max_epoch = let calculated_from_index_expected_rent_collection_slot_max_epoch =
expected_rent_collection_slot_max_epoch; expected_rent_collection_slot_max_epoch;
if expected_rent_collection_slot_max_epoch <= max_slot_in_storages_inclusive { if expected_rent_collection_slot_max_epoch <= max_slot_in_storages_inclusive.slot {
// may need to find a valid root // may need to find a valid root
if let Some(find) = if let Some(find) =
find_unskipped_slot(calculated_from_index_expected_rent_collection_slot_max_epoch) find_unskipped_slot(calculated_from_index_expected_rent_collection_slot_max_epoch)
@ -478,7 +477,7 @@ impl ExpectedRentCollection {
} }
} }
let mut use_previous_epoch_rent_collector = false; let mut use_previous_epoch_rent_collector = false;
if expected_rent_collection_slot_max_epoch > max_slot_in_storages_inclusive { if expected_rent_collection_slot_max_epoch > max_slot_in_storages_inclusive.slot {
// max slot has not hit the slot in the max epoch where we would have collected rent yet, so the most recent rent-collected rewrite slot for this pubkey would be in the previous epoch // max slot has not hit the slot in the max epoch where we would have collected rent yet, so the most recent rent-collected rewrite slot for this pubkey would be in the previous epoch
let previous_epoch = epoch_of_max_storage_slot.saturating_sub(1); let previous_epoch = epoch_of_max_storage_slot.saturating_sub(1);
let slots_per_epoch_previous_epoch = epoch_schedule.get_slots_in_epoch(previous_epoch); let slots_per_epoch_previous_epoch = epoch_schedule.get_slots_in_epoch(previous_epoch);
@ -609,7 +608,7 @@ pub mod tests {
storage_slot, storage_slot,
&epoch_schedule, &epoch_schedule,
&rent_collector, &rent_collector,
max_slot_in_storages_inclusive, &SlotInfoInEpoch::new(max_slot_in_storages_inclusive, &epoch_schedule),
find_unskipped_slot, find_unskipped_slot,
None, None,
); );
@ -637,7 +636,7 @@ pub mod tests {
storage_slot, storage_slot,
&epoch_schedule, &epoch_schedule,
&rent_collector, &rent_collector,
max_slot_in_storages_inclusive, &SlotInfoInEpoch::new(max_slot_in_storages_inclusive, &epoch_schedule),
find_unskipped_slot, find_unskipped_slot,
None, None,
); );
@ -662,7 +661,7 @@ pub mod tests {
expected_rent_collection_slot_max_epoch, expected_rent_collection_slot_max_epoch,
&epoch_schedule, &epoch_schedule,
&rent_collector, &rent_collector,
max_slot_in_storages_inclusive, &SlotInfoInEpoch::new(max_slot_in_storages_inclusive, &epoch_schedule),
find_unskipped_slot, find_unskipped_slot,
None, None,
); );
@ -690,7 +689,7 @@ pub mod tests {
expected_rent_collection_slot_max_epoch + if greater { 1 } else { 0 }, expected_rent_collection_slot_max_epoch + if greater { 1 } else { 0 },
&epoch_schedule, &epoch_schedule,
&rent_collector, &rent_collector,
max_slot_in_storages_inclusive, &SlotInfoInEpoch::new(max_slot_in_storages_inclusive, &epoch_schedule),
find_unskipped_slot, find_unskipped_slot,
None, None,
); );
@ -716,7 +715,11 @@ pub mod tests {
expected_rent_collection_slot_max_epoch, expected_rent_collection_slot_max_epoch,
&epoch_schedule, &epoch_schedule,
&rent_collector, &rent_collector,
max_slot_in_storages_inclusive + if previous_epoch { slots_per_epoch } else { 0 }, &SlotInfoInEpoch::new(
max_slot_in_storages_inclusive
+ if previous_epoch { slots_per_epoch } else { 0 },
&epoch_schedule,
),
find_unskipped_slot, find_unskipped_slot,
None, None,
); );
@ -750,7 +753,7 @@ pub mod tests {
expected_rent_collection_slot_max_epoch, expected_rent_collection_slot_max_epoch,
&epoch_schedule, &epoch_schedule,
&rent_collector, &rent_collector,
max_slot_in_storages_inclusive, &SlotInfoInEpoch::new(max_slot_in_storages_inclusive, &epoch_schedule),
find_unskipped_slot, find_unskipped_slot,
None, None,
); );
@ -790,7 +793,7 @@ pub mod tests {
storage_slot, storage_slot,
&epoch_schedule, &epoch_schedule,
&rent_collector, &rent_collector,
max_slot_in_storages_inclusive, &SlotInfoInEpoch::new(max_slot_in_storages_inclusive, &epoch_schedule),
find_unskipped_slot, find_unskipped_slot,
None, None,
); );
@ -840,7 +843,7 @@ pub mod tests {
storage_slot, storage_slot,
&epoch_schedule, &epoch_schedule,
&rent_collector, &rent_collector,
max_slot_in_storages_inclusive, &SlotInfoInEpoch::new(max_slot_in_storages_inclusive, &epoch_schedule),
find_unskipped_slot, find_unskipped_slot,
None, None,
); );
@ -883,7 +886,7 @@ pub mod tests {
storage_slot, storage_slot,
&epoch_schedule, &epoch_schedule,
&rent_collector, &rent_collector,
max_slot_in_storages_inclusive, &SlotInfoInEpoch::new(max_slot_in_storages_inclusive, &epoch_schedule),
find_unskipped_slot, find_unskipped_slot,
None, None,
); );
@ -916,7 +919,7 @@ pub mod tests {
storage_slot, storage_slot,
&epoch_schedule, &epoch_schedule,
&rent_collector, &rent_collector,
max_slot_in_storages_inclusive, &SlotInfoInEpoch::new(max_slot_in_storages_inclusive, &epoch_schedule),
find_unskipped_slot, find_unskipped_slot,
None, None,
); );
@ -1051,7 +1054,7 @@ pub mod tests {
storage_slot, storage_slot,
&epoch_schedule, &epoch_schedule,
&rent_collector, &rent_collector,
max_slot_in_storages_inclusive, &SlotInfoInEpoch::new(max_slot_in_storages_inclusive, &epoch_schedule),
find_unskipped_slot, find_unskipped_slot,
None, None,
); );
@ -1087,7 +1090,7 @@ pub mod tests {
storage_slot, storage_slot,
&epoch_schedule, &epoch_schedule,
&rent_collector, &rent_collector,
max_slot_in_storages_inclusive, &SlotInfoInEpoch::new(max_slot_in_storages_inclusive, &epoch_schedule),
find_unskipped_slot, find_unskipped_slot,
// treat this pubkey like a filler account so we get a 'LeaveAloneNoRent' result // treat this pubkey like a filler account so we get a 'LeaveAloneNoRent' result
Some(&pubkey), Some(&pubkey),
@ -1119,7 +1122,7 @@ pub mod tests {
&epoch_schedule, &epoch_schedule,
&rent_collector, &rent_collector,
&HashStats::default(), &HashStats::default(),
max_slot_in_storages_inclusive, &SlotInfoInEpoch::new(max_slot_in_storages_inclusive, &epoch_schedule),
find_unskipped_slot, find_unskipped_slot,
None, None,
); );