calculate_capitalization uses hash calculation (#17443)
* calculate_capitalization uses hash calculation * feedback * remove debugging code, clean up slot math
This commit is contained in:
parent
2dc6969858
commit
d4cc975fe9
|
@ -121,6 +121,7 @@ fn main() {
|
||||||
solana_sdk::clock::Slot::default(),
|
solana_sdk::clock::Slot::default(),
|
||||||
&ancestors,
|
&ancestors,
|
||||||
None,
|
None,
|
||||||
|
false,
|
||||||
);
|
);
|
||||||
time_store.stop();
|
time_store.stop();
|
||||||
if results != results_store {
|
if results != results_store {
|
||||||
|
|
|
@ -783,7 +783,8 @@ fn open_genesis_config_by(ledger_path: &Path, matches: &ArgMatches<'_>) -> Genes
|
||||||
}
|
}
|
||||||
|
|
||||||
fn assert_capitalization(bank: &Bank) {
|
fn assert_capitalization(bank: &Bank) {
|
||||||
assert!(bank.calculate_and_verify_capitalization());
|
let debug_verify = true;
|
||||||
|
assert!(bank.calculate_and_verify_capitalization(debug_verify));
|
||||||
}
|
}
|
||||||
|
|
||||||
#[allow(clippy::cognitive_complexity)]
|
#[allow(clippy::cognitive_complexity)]
|
||||||
|
|
|
@ -558,10 +558,14 @@ fn do_process_blockstore_from_root(
|
||||||
);
|
);
|
||||||
assert!(bank_forks.active_banks().is_empty());
|
assert!(bank_forks.active_banks().is_empty());
|
||||||
|
|
||||||
|
let debug_verify = false;
|
||||||
// We might be promptly restarted after bad capitalization was detected while creating newer snapshot.
|
// We might be promptly restarted after bad capitalization was detected while creating newer snapshot.
|
||||||
// In that case, we're most likely restored from the last good snapshot and replayed up to this root.
|
// In that case, we're most likely restored from the last good snapshot and replayed up to this root.
|
||||||
// So again check here for the bad capitalization to avoid to continue until the next snapshot creation.
|
// So again check here for the bad capitalization to avoid to continue until the next snapshot creation.
|
||||||
if !bank_forks.root_bank().calculate_and_verify_capitalization() {
|
if !bank_forks
|
||||||
|
.root_bank()
|
||||||
|
.calculate_and_verify_capitalization(debug_verify)
|
||||||
|
{
|
||||||
return Err(BlockstoreProcessorError::RootBankWithMismatchedCapitalization(root));
|
return Err(BlockstoreProcessorError::RootBankWithMismatchedCapitalization(root));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -627,20 +627,24 @@ impl Accounts {
|
||||||
.collect()
|
.collect()
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn calculate_capitalization(&self, ancestors: &Ancestors) -> u64 {
|
pub fn calculate_capitalization(
|
||||||
self.accounts_db.unchecked_scan_accounts(
|
&self,
|
||||||
"calculate_capitalization_scan_elapsed",
|
ancestors: &Ancestors,
|
||||||
ancestors,
|
slot: Slot,
|
||||||
|total_capitalization: &mut u64, (_pubkey, loaded_account, _slot)| {
|
can_cached_slot_be_unflushed: bool,
|
||||||
let lamports = loaded_account.lamports();
|
debug_verify: bool,
|
||||||
if Self::is_loadable(lamports) {
|
) -> u64 {
|
||||||
*total_capitalization = AccountsDb::checked_iterative_sum_for_capitalization(
|
let use_index = false;
|
||||||
*total_capitalization,
|
self.accounts_db
|
||||||
lamports,
|
.update_accounts_hash_with_index_option(
|
||||||
);
|
use_index,
|
||||||
}
|
debug_verify,
|
||||||
},
|
slot,
|
||||||
)
|
ancestors,
|
||||||
|
None,
|
||||||
|
can_cached_slot_be_unflushed,
|
||||||
|
)
|
||||||
|
.1
|
||||||
}
|
}
|
||||||
|
|
||||||
#[must_use]
|
#[must_use]
|
||||||
|
|
|
@ -48,6 +48,10 @@ impl SlotCacheInner {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn get_all_pubkeys(&self) -> Vec<Pubkey> {
|
||||||
|
self.cache.iter().map(|item| *item.key()).collect()
|
||||||
|
}
|
||||||
|
|
||||||
pub fn insert(
|
pub fn insert(
|
||||||
&self,
|
&self,
|
||||||
pubkey: &Pubkey,
|
pubkey: &Pubkey,
|
||||||
|
|
|
@ -4451,11 +4451,11 @@ impl AccountsDb {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn update_accounts_hash(&self, slot: Slot, ancestors: &Ancestors) -> (Hash, u64) {
|
pub fn update_accounts_hash(&self, slot: Slot, ancestors: &Ancestors) -> (Hash, u64) {
|
||||||
self.update_accounts_hash_with_index_option(true, false, slot, ancestors, None)
|
self.update_accounts_hash_with_index_option(true, false, slot, ancestors, None, false)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn update_accounts_hash_test(&self, slot: Slot, ancestors: &Ancestors) -> (Hash, u64) {
|
pub fn update_accounts_hash_test(&self, slot: Slot, ancestors: &Ancestors) -> (Hash, u64) {
|
||||||
self.update_accounts_hash_with_index_option(true, true, slot, ancestors, None)
|
self.update_accounts_hash_with_index_option(true, true, slot, ancestors, None, false)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn scan_multiple_account_storages_one_slot<F, B>(
|
fn scan_multiple_account_storages_one_slot<F, B>(
|
||||||
|
@ -4512,6 +4512,11 @@ impl AccountsDb {
|
||||||
|
|
||||||
/// Scan through all the account storage in parallel
|
/// Scan through all the account storage in parallel
|
||||||
fn scan_account_storage_no_bank<F, B>(
|
fn scan_account_storage_no_bank<F, B>(
|
||||||
|
accounts_cache_and_ancestors: Option<(
|
||||||
|
&AccountsCache,
|
||||||
|
&Ancestors,
|
||||||
|
&AccountInfoAccountsIndex,
|
||||||
|
)>,
|
||||||
snapshot_storages: &SortedStorages,
|
snapshot_storages: &SortedStorages,
|
||||||
scan_func: F,
|
scan_func: F,
|
||||||
) -> Vec<B>
|
) -> Vec<B>
|
||||||
|
@ -4531,7 +4536,9 @@ impl AccountsDb {
|
||||||
let end = std::cmp::min(start + MAX_ITEMS_PER_CHUNK, snapshot_storages.range().end);
|
let end = std::cmp::min(start + MAX_ITEMS_PER_CHUNK, snapshot_storages.range().end);
|
||||||
for slot in start..end {
|
for slot in start..end {
|
||||||
let sub_storages = snapshot_storages.get(slot);
|
let sub_storages = snapshot_storages.get(slot);
|
||||||
|
let mut valid_slot = false;
|
||||||
if let Some(sub_storages) = sub_storages {
|
if let Some(sub_storages) = sub_storages {
|
||||||
|
valid_slot = true;
|
||||||
Self::scan_multiple_account_storages_one_slot(
|
Self::scan_multiple_account_storages_one_slot(
|
||||||
sub_storages,
|
sub_storages,
|
||||||
&scan_func,
|
&scan_func,
|
||||||
|
@ -4539,6 +4546,26 @@ impl AccountsDb {
|
||||||
&mut retval,
|
&mut retval,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
if let Some((cache, ancestors, accounts_index)) = accounts_cache_and_ancestors {
|
||||||
|
if let Some(slot_cache) = cache.slot_cache(slot) {
|
||||||
|
if valid_slot
|
||||||
|
|| ancestors.contains_key(&slot)
|
||||||
|
|| accounts_index.is_root(slot)
|
||||||
|
{
|
||||||
|
let keys = slot_cache.get_all_pubkeys();
|
||||||
|
for key in keys {
|
||||||
|
if let Some(cached_account) = slot_cache.get_cloned(&key) {
|
||||||
|
let mut accessor = LoadedAccountAccessor::Cached(Some((
|
||||||
|
key,
|
||||||
|
Cow::Owned(cached_account),
|
||||||
|
)));
|
||||||
|
let account = accessor.get_loaded_account().unwrap();
|
||||||
|
scan_func(account, &mut retval, slot);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
retval
|
retval
|
||||||
})
|
})
|
||||||
|
@ -4551,14 +4578,26 @@ impl AccountsDb {
|
||||||
slot: Slot,
|
slot: Slot,
|
||||||
ancestors: &Ancestors,
|
ancestors: &Ancestors,
|
||||||
check_hash: bool,
|
check_hash: bool,
|
||||||
|
can_cached_slot_be_unflushed: bool,
|
||||||
) -> Result<(Hash, u64), BankHashVerificationError> {
|
) -> Result<(Hash, u64), BankHashVerificationError> {
|
||||||
if !use_index {
|
if !use_index {
|
||||||
|
let accounts_cache_and_ancestors = if can_cached_slot_be_unflushed {
|
||||||
|
Some((&self.accounts_cache, ancestors, &self.accounts_index))
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
};
|
||||||
|
|
||||||
let mut collect_time = Measure::start("collect");
|
let mut collect_time = Measure::start("collect");
|
||||||
let (combined_maps, slots) = self.get_snapshot_storages(slot, Some(ancestors));
|
let (combined_maps, slots) = self.get_snapshot_storages(slot, Some(ancestors));
|
||||||
collect_time.stop();
|
collect_time.stop();
|
||||||
|
|
||||||
let mut sort_time = Measure::start("sort_storages");
|
let mut sort_time = Measure::start("sort_storages");
|
||||||
let storages = SortedStorages::new_with_slots(combined_maps.iter().zip(slots.iter()));
|
let min_root = self.accounts_index.min_root();
|
||||||
|
let storages = SortedStorages::new_with_slots(
|
||||||
|
combined_maps.iter().zip(slots.iter()),
|
||||||
|
min_root,
|
||||||
|
Some(slot),
|
||||||
|
);
|
||||||
sort_time.stop();
|
sort_time.stop();
|
||||||
|
|
||||||
let timings = HashStats {
|
let timings = HashStats {
|
||||||
|
@ -4572,6 +4611,7 @@ impl AccountsDb {
|
||||||
Some(&self.thread_pool_clean),
|
Some(&self.thread_pool_clean),
|
||||||
timings,
|
timings,
|
||||||
check_hash,
|
check_hash,
|
||||||
|
accounts_cache_and_ancestors,
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
self.calculate_accounts_hash(slot, ancestors, check_hash)
|
self.calculate_accounts_hash(slot, ancestors, check_hash)
|
||||||
|
@ -4585,15 +4625,28 @@ impl AccountsDb {
|
||||||
slot: Slot,
|
slot: Slot,
|
||||||
ancestors: &Ancestors,
|
ancestors: &Ancestors,
|
||||||
expected_capitalization: Option<u64>,
|
expected_capitalization: Option<u64>,
|
||||||
|
can_cached_slot_be_unflushed: bool,
|
||||||
) -> (Hash, u64) {
|
) -> (Hash, u64) {
|
||||||
let check_hash = false;
|
let check_hash = false;
|
||||||
let (hash, total_lamports) = self
|
let (hash, total_lamports) = self
|
||||||
.calculate_accounts_hash_helper(use_index, slot, ancestors, check_hash)
|
.calculate_accounts_hash_helper(
|
||||||
|
use_index,
|
||||||
|
slot,
|
||||||
|
ancestors,
|
||||||
|
check_hash,
|
||||||
|
can_cached_slot_be_unflushed,
|
||||||
|
)
|
||||||
.unwrap(); // unwrap here will never fail since check_hash = false
|
.unwrap(); // unwrap here will never fail since check_hash = false
|
||||||
if debug_verify {
|
if debug_verify {
|
||||||
// calculate the other way (store or non-store) and verify results match.
|
// calculate the other way (store or non-store) and verify results match.
|
||||||
let (hash_other, total_lamports_other) = self
|
let (hash_other, total_lamports_other) = self
|
||||||
.calculate_accounts_hash_helper(!use_index, slot, ancestors, check_hash)
|
.calculate_accounts_hash_helper(
|
||||||
|
!use_index,
|
||||||
|
slot,
|
||||||
|
ancestors,
|
||||||
|
check_hash,
|
||||||
|
can_cached_slot_be_unflushed,
|
||||||
|
)
|
||||||
.unwrap(); // unwrap here will never fail since check_hash = false
|
.unwrap(); // unwrap here will never fail since check_hash = false
|
||||||
|
|
||||||
let success = hash == hash_other
|
let success = hash == hash_other
|
||||||
|
@ -4607,12 +4660,17 @@ impl AccountsDb {
|
||||||
(hash, total_lamports)
|
(hash, total_lamports)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn scan_snapshot_stores(
|
fn scan_snapshot_stores_with_cache(
|
||||||
storage: &SortedStorages,
|
storage: &SortedStorages,
|
||||||
mut stats: &mut crate::accounts_hash::HashStats,
|
mut stats: &mut crate::accounts_hash::HashStats,
|
||||||
bins: usize,
|
bins: usize,
|
||||||
bin_range: &Range<usize>,
|
bin_range: &Range<usize>,
|
||||||
check_hash: bool,
|
check_hash: bool,
|
||||||
|
accounts_cache_and_ancestors: Option<(
|
||||||
|
&AccountsCache,
|
||||||
|
&Ancestors,
|
||||||
|
&AccountInfoAccountsIndex,
|
||||||
|
)>,
|
||||||
) -> Result<Vec<Vec<Vec<CalculateHashIntermediate>>>, BankHashVerificationError> {
|
) -> Result<Vec<Vec<Vec<CalculateHashIntermediate>>>, BankHashVerificationError> {
|
||||||
let bin_calculator = PubkeyBinCalculator16::new(bins);
|
let bin_calculator = PubkeyBinCalculator16::new(bins);
|
||||||
assert!(bin_range.start < bins && bin_range.end <= bins && bin_range.start < bin_range.end);
|
assert!(bin_range.start < bins && bin_range.end <= bins && bin_range.start < bin_range.end);
|
||||||
|
@ -4621,6 +4679,7 @@ impl AccountsDb {
|
||||||
let mismatch_found = AtomicU64::new(0);
|
let mismatch_found = AtomicU64::new(0);
|
||||||
|
|
||||||
let result: Vec<Vec<Vec<CalculateHashIntermediate>>> = Self::scan_account_storage_no_bank(
|
let result: Vec<Vec<Vec<CalculateHashIntermediate>>> = Self::scan_account_storage_no_bank(
|
||||||
|
accounts_cache_and_ancestors,
|
||||||
storage,
|
storage,
|
||||||
|loaded_account: LoadedAccount,
|
|loaded_account: LoadedAccount,
|
||||||
accum: &mut Vec<Vec<CalculateHashIntermediate>>,
|
accum: &mut Vec<Vec<CalculateHashIntermediate>>,
|
||||||
|
@ -4685,6 +4744,11 @@ impl AccountsDb {
|
||||||
thread_pool: Option<&ThreadPool>,
|
thread_pool: Option<&ThreadPool>,
|
||||||
mut stats: HashStats,
|
mut stats: HashStats,
|
||||||
check_hash: bool,
|
check_hash: bool,
|
||||||
|
accounts_cache_and_ancestors: Option<(
|
||||||
|
&AccountsCache,
|
||||||
|
&Ancestors,
|
||||||
|
&AccountInfoAccountsIndex,
|
||||||
|
)>,
|
||||||
) -> Result<(Hash, u64), BankHashVerificationError> {
|
) -> Result<(Hash, u64), BankHashVerificationError> {
|
||||||
let mut scan_and_hash = move || {
|
let mut scan_and_hash = move || {
|
||||||
// When calculating hashes, it is helpful to break the pubkeys found into bins based on the pubkey value.
|
// When calculating hashes, it is helpful to break the pubkeys found into bins based on the pubkey value.
|
||||||
|
@ -4711,12 +4775,13 @@ impl AccountsDb {
|
||||||
end: (pass + 1) * bins_per_pass,
|
end: (pass + 1) * bins_per_pass,
|
||||||
};
|
};
|
||||||
|
|
||||||
let result = Self::scan_snapshot_stores(
|
let result = Self::scan_snapshot_stores_with_cache(
|
||||||
&storages,
|
&storages,
|
||||||
&mut stats,
|
&mut stats,
|
||||||
PUBKEY_BINS_FOR_CALCULATING_HASHES,
|
PUBKEY_BINS_FOR_CALCULATING_HASHES,
|
||||||
&bounds,
|
&bounds,
|
||||||
check_hash,
|
check_hash,
|
||||||
|
accounts_cache_and_ancestors,
|
||||||
)?;
|
)?;
|
||||||
|
|
||||||
let (hash, lamports, for_next_pass) = AccountsHash::rest_of_hash_calculation(
|
let (hash, lamports, for_next_pass) = AccountsHash::rest_of_hash_calculation(
|
||||||
|
@ -4746,7 +4811,7 @@ impl AccountsDb {
|
||||||
use BankHashVerificationError::*;
|
use BankHashVerificationError::*;
|
||||||
|
|
||||||
let (calculated_hash, calculated_lamports) =
|
let (calculated_hash, calculated_lamports) =
|
||||||
self.calculate_accounts_hash_helper(true, slot, ancestors, true)?;
|
self.calculate_accounts_hash_helper(true, slot, ancestors, true, false)?;
|
||||||
|
|
||||||
if calculated_lamports != total_lamports {
|
if calculated_lamports != total_lamports {
|
||||||
warn!(
|
warn!(
|
||||||
|
@ -5506,7 +5571,7 @@ impl AccountsDb {
|
||||||
pub fn get_snapshot_storages(
|
pub fn get_snapshot_storages(
|
||||||
&self,
|
&self,
|
||||||
snapshot_slot: Slot,
|
snapshot_slot: Slot,
|
||||||
_ancestors: Option<&Ancestors>,
|
ancestors: Option<&Ancestors>,
|
||||||
) -> (SnapshotStorages, Vec<Slot>) {
|
) -> (SnapshotStorages, Vec<Slot>) {
|
||||||
let mut m = Measure::start("get slots");
|
let mut m = Measure::start("get slots");
|
||||||
let slots = self
|
let slots = self
|
||||||
|
@ -5526,7 +5591,12 @@ impl AccountsDb {
|
||||||
slots
|
slots
|
||||||
.iter()
|
.iter()
|
||||||
.filter_map(|slot| {
|
.filter_map(|slot| {
|
||||||
if *slot <= snapshot_slot && self.accounts_index.is_root(*slot) {
|
if *slot <= snapshot_slot
|
||||||
|
&& (self.accounts_index.is_root(*slot)
|
||||||
|
|| ancestors
|
||||||
|
.map(|ancestors| ancestors.contains_key(&slot))
|
||||||
|
.unwrap_or_default())
|
||||||
|
{
|
||||||
self.storage.0.get(&slot).map_or_else(
|
self.storage.0.get(&slot).map_or_else(
|
||||||
|| None,
|
|| None,
|
||||||
|item| {
|
|item| {
|
||||||
|
@ -6033,6 +6103,18 @@ pub mod tests {
|
||||||
SortedStorages::new(&[])
|
SortedStorages::new(&[])
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl AccountsDb {
|
||||||
|
fn scan_snapshot_stores(
|
||||||
|
storage: &SortedStorages,
|
||||||
|
stats: &mut crate::accounts_hash::HashStats,
|
||||||
|
bins: usize,
|
||||||
|
bin_range: &Range<usize>,
|
||||||
|
check_hash: bool,
|
||||||
|
) -> Result<Vec<Vec<Vec<CalculateHashIntermediate>>>, BankHashVerificationError> {
|
||||||
|
Self::scan_snapshot_stores_with_cache(storage, stats, bins, bin_range, check_hash, None)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
#[should_panic(
|
#[should_panic(
|
||||||
expected = "bin_range.start < bins && bin_range.end <= bins &&\\n bin_range.start < bin_range.end"
|
expected = "bin_range.start < bins && bin_range.end <= bins &&\\n bin_range.start < bin_range.end"
|
||||||
|
@ -6368,6 +6450,7 @@ pub mod tests {
|
||||||
None,
|
None,
|
||||||
HashStats::default(),
|
HashStats::default(),
|
||||||
false,
|
false,
|
||||||
|
None,
|
||||||
)
|
)
|
||||||
.unwrap();
|
.unwrap();
|
||||||
let expected_hash = Hash::from_str("GKot5hBsd81kMupNCXHaqbhv3huEbxAFMLnpcX2hniwn").unwrap();
|
let expected_hash = Hash::from_str("GKot5hBsd81kMupNCXHaqbhv3huEbxAFMLnpcX2hniwn").unwrap();
|
||||||
|
@ -6389,6 +6472,7 @@ pub mod tests {
|
||||||
None,
|
None,
|
||||||
HashStats::default(),
|
HashStats::default(),
|
||||||
false,
|
false,
|
||||||
|
None,
|
||||||
)
|
)
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
||||||
|
@ -6436,6 +6520,7 @@ pub mod tests {
|
||||||
|
|
||||||
let calls = AtomicU64::new(0);
|
let calls = AtomicU64::new(0);
|
||||||
let result = AccountsDb::scan_account_storage_no_bank(
|
let result = AccountsDb::scan_account_storage_no_bank(
|
||||||
|
None,
|
||||||
&get_storage_refs(&storages),
|
&get_storage_refs(&storages),
|
||||||
|loaded_account: LoadedAccount, accum: &mut Vec<u64>, slot: Slot| {
|
|loaded_account: LoadedAccount, accum: &mut Vec<u64>, slot: Slot| {
|
||||||
calls.fetch_add(1, Ordering::Relaxed);
|
calls.fetch_add(1, Ordering::Relaxed);
|
||||||
|
@ -8478,10 +8563,10 @@ pub mod tests {
|
||||||
db.add_root(some_slot);
|
db.add_root(some_slot);
|
||||||
let check_hash = true;
|
let check_hash = true;
|
||||||
assert!(db
|
assert!(db
|
||||||
.calculate_accounts_hash_helper(false, some_slot, &ancestors, check_hash)
|
.calculate_accounts_hash_helper(false, some_slot, &ancestors, check_hash, false)
|
||||||
.is_err());
|
.is_err());
|
||||||
assert!(db
|
assert!(db
|
||||||
.calculate_accounts_hash_helper(true, some_slot, &ancestors, check_hash)
|
.calculate_accounts_hash_helper(true, some_slot, &ancestors, check_hash, false)
|
||||||
.is_err());
|
.is_err());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -8501,9 +8586,9 @@ pub mod tests {
|
||||||
db.add_root(some_slot);
|
db.add_root(some_slot);
|
||||||
let check_hash = true;
|
let check_hash = true;
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
db.calculate_accounts_hash_helper(false, some_slot, &ancestors, check_hash)
|
db.calculate_accounts_hash_helper(false, some_slot, &ancestors, check_hash, false)
|
||||||
.unwrap(),
|
.unwrap(),
|
||||||
db.calculate_accounts_hash_helper(true, some_slot, &ancestors, check_hash)
|
db.calculate_accounts_hash_helper(true, some_slot, &ancestors, check_hash, false)
|
||||||
.unwrap(),
|
.unwrap(),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1550,6 +1550,10 @@ impl<T: 'static + Clone + IsCached + ZeroLamport> AccountsIndex<T> {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn min_root(&self) -> Option<Slot> {
|
||||||
|
self.roots_tracker.read().unwrap().min_root()
|
||||||
|
}
|
||||||
|
|
||||||
pub fn reset_uncleaned_roots(&self, max_clean_root: Option<Slot>) -> HashSet<Slot> {
|
pub fn reset_uncleaned_roots(&self, max_clean_root: Option<Slot>) -> HashSet<Slot> {
|
||||||
let mut cleaned_roots = HashSet::new();
|
let mut cleaned_roots = HashSet::new();
|
||||||
let mut w_roots_tracker = self.roots_tracker.write().unwrap();
|
let mut w_roots_tracker = self.roots_tracker.write().unwrap();
|
||||||
|
|
|
@ -4568,12 +4568,18 @@ impl Bank {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn calculate_capitalization(&self) -> u64 {
|
pub fn calculate_capitalization(&self, debug_verify: bool) -> u64 {
|
||||||
self.rc.accounts.calculate_capitalization(&self.ancestors)
|
let can_cached_slot_be_unflushed = true; // implied yes
|
||||||
|
self.rc.accounts.calculate_capitalization(
|
||||||
|
&self.ancestors,
|
||||||
|
self.slot(),
|
||||||
|
can_cached_slot_be_unflushed,
|
||||||
|
debug_verify,
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn calculate_and_verify_capitalization(&self) -> bool {
|
pub fn calculate_and_verify_capitalization(&self, debug_verify: bool) -> bool {
|
||||||
let calculated = self.calculate_capitalization();
|
let calculated = self.calculate_capitalization(debug_verify);
|
||||||
let expected = self.capitalization();
|
let expected = self.capitalization();
|
||||||
if calculated == expected {
|
if calculated == expected {
|
||||||
true
|
true
|
||||||
|
@ -4590,8 +4596,9 @@ impl Bank {
|
||||||
/// This should only be used for developing purposes.
|
/// This should only be used for developing purposes.
|
||||||
pub fn set_capitalization(&self) -> u64 {
|
pub fn set_capitalization(&self) -> u64 {
|
||||||
let old = self.capitalization();
|
let old = self.capitalization();
|
||||||
|
let debug_verify = true;
|
||||||
self.capitalization
|
self.capitalization
|
||||||
.store(self.calculate_capitalization(), Relaxed);
|
.store(self.calculate_capitalization(debug_verify), Relaxed);
|
||||||
old
|
old
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4618,6 +4625,7 @@ impl Bank {
|
||||||
self.slot(),
|
self.slot(),
|
||||||
&self.ancestors,
|
&self.ancestors,
|
||||||
Some(self.capitalization()),
|
Some(self.capitalization()),
|
||||||
|
false,
|
||||||
);
|
);
|
||||||
if total_lamports != self.capitalization() {
|
if total_lamports != self.capitalization() {
|
||||||
datapoint_info!(
|
datapoint_info!(
|
||||||
|
@ -5849,7 +5857,7 @@ pub(crate) mod tests {
|
||||||
updater();
|
updater();
|
||||||
let new = bank.capitalization();
|
let new = bank.capitalization();
|
||||||
asserter(old, new);
|
asserter(old, new);
|
||||||
assert_eq!(bank.capitalization(), bank.calculate_capitalization());
|
assert_eq!(bank.capitalization(), bank.calculate_capitalization(true));
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
@ -6145,7 +6153,7 @@ pub(crate) mod tests {
|
||||||
burned_portion
|
burned_portion
|
||||||
);
|
);
|
||||||
|
|
||||||
assert!(bank.calculate_and_verify_capitalization());
|
assert!(bank.calculate_and_verify_capitalization(true));
|
||||||
|
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
rent_to_be_distributed,
|
rent_to_be_distributed,
|
||||||
|
@ -7321,7 +7329,7 @@ pub(crate) mod tests {
|
||||||
)]
|
)]
|
||||||
);
|
);
|
||||||
bank1.freeze();
|
bank1.freeze();
|
||||||
assert!(bank1.calculate_and_verify_capitalization());
|
assert!(bank1.calculate_and_verify_capitalization(true));
|
||||||
}
|
}
|
||||||
|
|
||||||
fn do_test_bank_update_rewards_determinism() -> u64 {
|
fn do_test_bank_update_rewards_determinism() -> u64 {
|
||||||
|
@ -7399,7 +7407,7 @@ pub(crate) mod tests {
|
||||||
assert_ne!(bank1.capitalization(), bank.capitalization());
|
assert_ne!(bank1.capitalization(), bank.capitalization());
|
||||||
|
|
||||||
bank1.freeze();
|
bank1.freeze();
|
||||||
assert!(bank1.calculate_and_verify_capitalization());
|
assert!(bank1.calculate_and_verify_capitalization(true));
|
||||||
|
|
||||||
// verify voting and staking rewards are recorded
|
// verify voting and staking rewards are recorded
|
||||||
let rewards = bank1.rewards.read().unwrap();
|
let rewards = bank1.rewards.read().unwrap();
|
||||||
|
@ -8630,7 +8638,7 @@ pub(crate) mod tests {
|
||||||
// First, initialize the clock sysvar
|
// First, initialize the clock sysvar
|
||||||
activate_all_features(&mut genesis_config);
|
activate_all_features(&mut genesis_config);
|
||||||
let bank1 = Arc::new(Bank::new(&genesis_config));
|
let bank1 = Arc::new(Bank::new(&genesis_config));
|
||||||
assert_eq!(bank1.calculate_capitalization(), bank1.capitalization());
|
assert_eq!(bank1.calculate_capitalization(true), bank1.capitalization());
|
||||||
|
|
||||||
assert_capitalization_diff(
|
assert_capitalization_diff(
|
||||||
&bank1,
|
&bank1,
|
||||||
|
@ -9389,7 +9397,7 @@ pub(crate) mod tests {
|
||||||
// Non-native loader accounts can not be used for instruction processing
|
// Non-native loader accounts can not be used for instruction processing
|
||||||
assert!(bank.stakes.read().unwrap().vote_accounts().is_empty());
|
assert!(bank.stakes.read().unwrap().vote_accounts().is_empty());
|
||||||
assert!(bank.stakes.read().unwrap().stake_delegations().is_empty());
|
assert!(bank.stakes.read().unwrap().stake_delegations().is_empty());
|
||||||
assert_eq!(bank.calculate_capitalization(), bank.capitalization());
|
assert_eq!(bank.calculate_capitalization(true), bank.capitalization());
|
||||||
|
|
||||||
let ((vote_id, vote_account), (stake_id, stake_account)) =
|
let ((vote_id, vote_account), (stake_id, stake_account)) =
|
||||||
crate::stakes::tests::create_staked_node_accounts(1_0000);
|
crate::stakes::tests::create_staked_node_accounts(1_0000);
|
||||||
|
@ -9399,13 +9407,13 @@ pub(crate) mod tests {
|
||||||
bank.store_account(&stake_id, &stake_account);
|
bank.store_account(&stake_id, &stake_account);
|
||||||
assert!(!bank.stakes.read().unwrap().vote_accounts().is_empty());
|
assert!(!bank.stakes.read().unwrap().vote_accounts().is_empty());
|
||||||
assert!(!bank.stakes.read().unwrap().stake_delegations().is_empty());
|
assert!(!bank.stakes.read().unwrap().stake_delegations().is_empty());
|
||||||
assert_eq!(bank.calculate_capitalization(), bank.capitalization());
|
assert_eq!(bank.calculate_capitalization(true), bank.capitalization());
|
||||||
|
|
||||||
bank.add_builtin("mock_program1", vote_id, mock_ix_processor);
|
bank.add_builtin("mock_program1", vote_id, mock_ix_processor);
|
||||||
bank.add_builtin("mock_program2", stake_id, mock_ix_processor);
|
bank.add_builtin("mock_program2", stake_id, mock_ix_processor);
|
||||||
assert!(bank.stakes.read().unwrap().vote_accounts().is_empty());
|
assert!(bank.stakes.read().unwrap().vote_accounts().is_empty());
|
||||||
assert!(bank.stakes.read().unwrap().stake_delegations().is_empty());
|
assert!(bank.stakes.read().unwrap().stake_delegations().is_empty());
|
||||||
assert_eq!(bank.calculate_capitalization(), bank.capitalization());
|
assert_eq!(bank.calculate_capitalization(true), bank.capitalization());
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
"mock_program1",
|
"mock_program1",
|
||||||
String::from_utf8_lossy(&bank.get_account(&vote_id).unwrap_or_default().data())
|
String::from_utf8_lossy(&bank.get_account(&vote_id).unwrap_or_default().data())
|
||||||
|
@ -9425,7 +9433,7 @@ pub(crate) mod tests {
|
||||||
assert_eq!(old_hash, new_hash);
|
assert_eq!(old_hash, new_hash);
|
||||||
assert!(bank.stakes.read().unwrap().vote_accounts().is_empty());
|
assert!(bank.stakes.read().unwrap().vote_accounts().is_empty());
|
||||||
assert!(bank.stakes.read().unwrap().stake_delegations().is_empty());
|
assert!(bank.stakes.read().unwrap().stake_delegations().is_empty());
|
||||||
assert_eq!(bank.calculate_capitalization(), bank.capitalization());
|
assert_eq!(bank.calculate_capitalization(true), bank.capitalization());
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
"mock_program1",
|
"mock_program1",
|
||||||
String::from_utf8_lossy(&bank.get_account(&vote_id).unwrap_or_default().data())
|
String::from_utf8_lossy(&bank.get_account(&vote_id).unwrap_or_default().data())
|
||||||
|
@ -11037,16 +11045,16 @@ pub(crate) mod tests {
|
||||||
let program_id = solana_sdk::pubkey::new_rand();
|
let program_id = solana_sdk::pubkey::new_rand();
|
||||||
|
|
||||||
bank.add_native_program("mock_program", &program_id, false);
|
bank.add_native_program("mock_program", &program_id, false);
|
||||||
assert_eq!(bank.capitalization(), bank.calculate_capitalization());
|
assert_eq!(bank.capitalization(), bank.calculate_capitalization(true));
|
||||||
|
|
||||||
// someone mess with program_id's balance
|
// someone mess with program_id's balance
|
||||||
bank.withdraw(&mint_keypair.pubkey(), 10).unwrap();
|
bank.withdraw(&mint_keypair.pubkey(), 10).unwrap();
|
||||||
assert_ne!(bank.capitalization(), bank.calculate_capitalization());
|
assert_ne!(bank.capitalization(), bank.calculate_capitalization(true));
|
||||||
bank.deposit(&program_id, 10).unwrap();
|
bank.deposit(&program_id, 10).unwrap();
|
||||||
assert_eq!(bank.capitalization(), bank.calculate_capitalization());
|
assert_eq!(bank.capitalization(), bank.calculate_capitalization(true));
|
||||||
|
|
||||||
bank.add_native_program("mock_program v2", &program_id, true);
|
bank.add_native_program("mock_program v2", &program_id, true);
|
||||||
assert_eq!(bank.capitalization(), bank.calculate_capitalization());
|
assert_eq!(bank.capitalization(), bank.calculate_capitalization(true));
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
@ -11057,12 +11065,12 @@ pub(crate) mod tests {
|
||||||
|
|
||||||
// someone managed to squat at program_id!
|
// someone managed to squat at program_id!
|
||||||
bank.withdraw(&mint_keypair.pubkey(), 10).unwrap();
|
bank.withdraw(&mint_keypair.pubkey(), 10).unwrap();
|
||||||
assert_ne!(bank.capitalization(), bank.calculate_capitalization());
|
assert_ne!(bank.capitalization(), bank.calculate_capitalization(true));
|
||||||
bank.deposit(&program_id, 10).unwrap();
|
bank.deposit(&program_id, 10).unwrap();
|
||||||
assert_eq!(bank.capitalization(), bank.calculate_capitalization());
|
assert_eq!(bank.capitalization(), bank.calculate_capitalization(true));
|
||||||
|
|
||||||
bank.add_native_program("mock_program", &program_id, false);
|
bank.add_native_program("mock_program", &program_id, false);
|
||||||
assert_eq!(bank.capitalization(), bank.calculate_capitalization());
|
assert_eq!(bank.capitalization(), bank.calculate_capitalization(true));
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
@ -11213,13 +11221,13 @@ pub(crate) mod tests {
|
||||||
bank0.capitalization() + 1 + 1_000_000_000 + sysvar_and_native_proram_delta,
|
bank0.capitalization() + 1 + 1_000_000_000 + sysvar_and_native_proram_delta,
|
||||||
bank1.capitalization()
|
bank1.capitalization()
|
||||||
);
|
);
|
||||||
assert_eq!(bank1.capitalization(), bank1.calculate_capitalization());
|
assert_eq!(bank1.capitalization(), bank1.calculate_capitalization(true));
|
||||||
|
|
||||||
// Depending on RUSTFLAGS, this test exposes rust's checked math behavior or not...
|
// Depending on RUSTFLAGS, this test exposes rust's checked math behavior or not...
|
||||||
// So do some convolted setup; anyway this test itself will just be temporary
|
// So do some convolted setup; anyway this test itself will just be temporary
|
||||||
let bank0 = std::panic::AssertUnwindSafe(bank0);
|
let bank0 = std::panic::AssertUnwindSafe(bank0);
|
||||||
let overflowing_capitalization =
|
let overflowing_capitalization =
|
||||||
std::panic::catch_unwind(|| bank0.calculate_capitalization());
|
std::panic::catch_unwind(|| bank0.calculate_capitalization(true));
|
||||||
if let Ok(overflowing_capitalization) = overflowing_capitalization {
|
if let Ok(overflowing_capitalization) = overflowing_capitalization {
|
||||||
info!("asserting overflowing capitalization for bank0");
|
info!("asserting overflowing capitalization for bank0");
|
||||||
assert_eq!(overflowing_capitalization, bank0.capitalization());
|
assert_eq!(overflowing_capitalization, bank0.capitalization());
|
||||||
|
|
|
@ -1010,6 +1010,7 @@ pub fn process_accounts_package_pre(
|
||||||
thread_pool,
|
thread_pool,
|
||||||
crate::accounts_hash::HashStats::default(),
|
crate::accounts_hash::HashStats::default(),
|
||||||
false,
|
false,
|
||||||
|
None,
|
||||||
)
|
)
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
||||||
|
|
|
@ -45,7 +45,7 @@ impl<'a> SortedStorages<'a> {
|
||||||
storage.slot() // this must be unique. Will be enforced in new_with_slots
|
storage.slot() // this must be unique. Will be enforced in new_with_slots
|
||||||
})
|
})
|
||||||
.collect::<Vec<_>>();
|
.collect::<Vec<_>>();
|
||||||
Self::new_with_slots(source.iter().zip(slots.iter()))
|
Self::new_with_slots(source.iter().zip(slots.iter()), None, None)
|
||||||
}
|
}
|
||||||
|
|
||||||
// source[i] is in slot slots[i]
|
// source[i] is in slot slots[i]
|
||||||
|
@ -54,17 +54,34 @@ impl<'a> SortedStorages<'a> {
|
||||||
// 2. slots and source are the same len
|
// 2. slots and source are the same len
|
||||||
pub fn new_with_slots<'b>(
|
pub fn new_with_slots<'b>(
|
||||||
source: impl Iterator<Item = (&'a SnapshotStorage, &'b Slot)> + Clone,
|
source: impl Iterator<Item = (&'a SnapshotStorage, &'b Slot)> + Clone,
|
||||||
|
// A slot used as a lower bound, but potentially smaller than the smallest slot in the given 'source' iterator
|
||||||
|
min_slot: Option<Slot>,
|
||||||
|
// highest valid slot. Only matters if source array does not contain a slot >= max_slot_inclusive.
|
||||||
|
// An example is a slot that has accounts in the write cache at slots <= 'max_slot_inclusive' but no storages at those slots.
|
||||||
|
// None => self.range.end = source.1.max() + 1
|
||||||
|
// Some(slot) => self.range.end = std::cmp::max(slot, source.1.max())
|
||||||
|
max_slot_inclusive: Option<Slot>,
|
||||||
) -> Self {
|
) -> Self {
|
||||||
let mut min = Slot::MAX;
|
let mut min = Slot::MAX;
|
||||||
let mut max = Slot::MIN;
|
let mut max = Slot::MIN;
|
||||||
|
let mut adjust_min_max = |slot| {
|
||||||
|
min = std::cmp::min(slot, min);
|
||||||
|
max = std::cmp::max(slot + 1, max);
|
||||||
|
};
|
||||||
|
// none, either, or both of min/max could be specified
|
||||||
|
if let Some(slot) = min_slot {
|
||||||
|
adjust_min_max(slot);
|
||||||
|
}
|
||||||
|
if let Some(slot) = max_slot_inclusive {
|
||||||
|
adjust_min_max(slot);
|
||||||
|
}
|
||||||
|
|
||||||
let mut slot_count = 0;
|
let mut slot_count = 0;
|
||||||
let mut time = Measure::start("get slot");
|
let mut time = Measure::start("get slot");
|
||||||
let source_ = source.clone();
|
let source_ = source.clone();
|
||||||
source_.for_each(|(_, slot)| {
|
source_.for_each(|(_, slot)| {
|
||||||
slot_count += 1;
|
slot_count += 1;
|
||||||
let slot = *slot;
|
adjust_min_max(*slot);
|
||||||
min = std::cmp::min(slot, min);
|
|
||||||
max = std::cmp::max(slot + 1, max);
|
|
||||||
});
|
});
|
||||||
time.stop();
|
time.stop();
|
||||||
let mut time2 = Measure::start("sort");
|
let mut time2 = Measure::start("sort");
|
||||||
|
@ -128,12 +145,16 @@ pub mod tests {
|
||||||
#[test]
|
#[test]
|
||||||
#[should_panic(expected = "slots are not unique")]
|
#[should_panic(expected = "slots are not unique")]
|
||||||
fn test_sorted_storages_duplicate_slots() {
|
fn test_sorted_storages_duplicate_slots() {
|
||||||
SortedStorages::new_with_slots([Vec::new(), Vec::new()].iter().zip([0, 0].iter()));
|
SortedStorages::new_with_slots(
|
||||||
|
[Vec::new(), Vec::new()].iter().zip([0, 0].iter()),
|
||||||
|
None,
|
||||||
|
None,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_sorted_storages_none() {
|
fn test_sorted_storages_none() {
|
||||||
let result = SortedStorages::new_with_slots([].iter().zip([].iter()));
|
let result = SortedStorages::new_with_slots([].iter().zip([].iter()), None, None);
|
||||||
assert_eq!(result.range, Range::default());
|
assert_eq!(result.range, Range::default());
|
||||||
assert_eq!(result.slot_count, 0);
|
assert_eq!(result.slot_count, 0);
|
||||||
assert_eq!(result.storages.len(), 0);
|
assert_eq!(result.storages.len(), 0);
|
||||||
|
@ -146,7 +167,7 @@ pub mod tests {
|
||||||
let vec_check = vec.clone();
|
let vec_check = vec.clone();
|
||||||
let slot = 4;
|
let slot = 4;
|
||||||
let vecs = [vec];
|
let vecs = [vec];
|
||||||
let result = SortedStorages::new_with_slots(vecs.iter().zip([slot].iter()));
|
let result = SortedStorages::new_with_slots(vecs.iter().zip([slot].iter()), None, None);
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
result.range,
|
result.range,
|
||||||
Range {
|
Range {
|
||||||
|
@ -165,7 +186,7 @@ pub mod tests {
|
||||||
let vec_check = vec.clone();
|
let vec_check = vec.clone();
|
||||||
let slots = [4, 7];
|
let slots = [4, 7];
|
||||||
let vecs = [vec.clone(), vec];
|
let vecs = [vec.clone(), vec];
|
||||||
let result = SortedStorages::new_with_slots(vecs.iter().zip(slots.iter()));
|
let result = SortedStorages::new_with_slots(vecs.iter().zip(slots.iter()), None, None);
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
result.range,
|
result.range,
|
||||||
Range {
|
Range {
|
||||||
|
|
Loading…
Reference in New Issue