Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Uses real stored count in check_storage() #2944

Merged
merged 1 commit into from
Sep 19, 2024
+17 −21
Merged

Uses real stored count in check_storage() #2944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions accounts-db/src/accounts_db.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9560,15 +9560,11 @@ impl AccountsDb {
}
}

pub fn check_storage(&self, slot: Slot, count: usize) {
assert!(self.storage.get_slot_storage_entry(slot).is_some());
pub fn check_storage(&self, slot: Slot, alive_count: usize, total_count: usize) {
let store = self.storage.get_slot_storage_entry(slot).unwrap();
let total_count = store.count();
assert_eq!(store.status(), AccountStorageStatus::Available);
assert_eq!(total_count, count);
let (expected_store_count, actual_store_count): (usize, usize) =
(store.approx_stored_count(), store.accounts_count());
assert_eq!(expected_store_count, actual_store_count);
assert_eq!(store.count(), alive_count);
assert_eq!(store.accounts_count(), total_count);
}

pub fn create_account(
Expand Down Expand Up @@ -10761,7 +10757,7 @@ pub mod tests {
let mut pubkeys: Vec<Pubkey> = vec![];
db.create_account(&mut pubkeys, 0, 2, DEFAULT_FILE_SIZE as usize / 3, 0);
db.add_root_and_flush_write_cache(0);
db.check_storage(0, 2);
db.check_storage(0, 2, 2);

let pubkey = solana_sdk::pubkey::new_rand();
let account = AccountSharedData::new(1, DEFAULT_FILE_SIZE as usize / 3, &pubkey);
Expand Down Expand Up @@ -10913,7 +10909,7 @@ pub mod tests {
accounts.create_account(&mut pubkeys, 0, 100, 0, 0);
update_accounts(&accounts, &pubkeys, 0, 99);
accounts.add_root_and_flush_write_cache(0);
accounts.check_storage(0, 100);
accounts.check_storage(0, 100, 100);
}

#[test]
Expand Down Expand Up @@ -11837,9 +11833,9 @@ pub mod tests {

// storage for slot 1 had 2 accounts, now has 1 after pubkey 1
// was reclaimed
accounts.check_storage(1, 1);
accounts.check_storage(1, 1, 2);
// storage for slot 2 had 1 accounts, now has 1
accounts.check_storage(2, 1);
accounts.check_storage(2, 1, 1);
}

#[test]
Expand Down
20 changes: 10 additions & 10 deletions runtime/src/serde_snapshot/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ mod serde_snapshot_tests {
accounts.create_account(&mut pubkeys, 0, 100, 0, 0);
if pass == 0 {
accounts.add_root_and_flush_write_cache(0);
accounts.check_storage(0, 100);
accounts.check_storage(0, 100, 100);
accounts.clean_accounts_for_tests();
accounts.check_accounts(&pubkeys, 0, 100, 1);
// clean should have done nothing
Expand All @@ -334,7 +334,7 @@ mod serde_snapshot_tests {
// do some updates to those accounts and re-check
accounts.modify_accounts(&pubkeys, 0, 100, 2);
accounts.add_root_and_flush_write_cache(0);
accounts.check_storage(0, 100);
accounts.check_storage(0, 100, 100);
accounts.check_accounts(&pubkeys, 0, 100, 2);
accounts.calculate_accounts_delta_hash(0);

Expand All @@ -356,7 +356,7 @@ mod serde_snapshot_tests {

accounts.calculate_accounts_delta_hash(latest_slot);
accounts.add_root_and_flush_write_cache(latest_slot);
accounts.check_storage(1, 21);
accounts.check_storage(1, 21, 21);

// CREATE SLOT 2
let latest_slot = 2;
Expand All @@ -376,7 +376,7 @@ mod serde_snapshot_tests {

accounts.calculate_accounts_delta_hash(latest_slot);
accounts.add_root_and_flush_write_cache(latest_slot);
accounts.check_storage(2, 31);
accounts.check_storage(2, 31, 31);

let ancestors = linear_ancestors(latest_slot);
accounts.update_accounts_hash_for_tests(latest_slot, &ancestors, false, false);
Expand All @@ -385,11 +385,11 @@ mod serde_snapshot_tests {
// The first 20 accounts of slot 0 have been updated in slot 2, as well as
// accounts 30 and 31 (overwritten with zero-lamport accounts in slot 1 and
// slot 2 respectively), so only 78 accounts are left in slot 0's storage entries.
accounts.check_storage(0, 78);
accounts.check_storage(0, 78, 100);
// 10 of the 21 accounts have been modified in slot 2, so only 11
// accounts left in slot 1.
accounts.check_storage(1, 11);
accounts.check_storage(2, 31);
accounts.check_storage(1, 11, 21);
accounts.check_storage(2, 31, 31);

let daccounts =
reconstruct_accounts_db_via_serialization(&accounts, latest_slot, storage_access);
Expand Down Expand Up @@ -417,9 +417,9 @@ mod serde_snapshot_tests {
// Don't check the first 35 accounts which have not been modified on slot 0
daccounts.check_accounts(&pubkeys[35..], 0, 65, 37);
daccounts.check_accounts(&pubkeys1, 1, 10, 1);
daccounts.check_storage(0, 100);
daccounts.check_storage(1, 21);
daccounts.check_storage(2, 31);
daccounts.check_storage(0, 100, 100);
daccounts.check_storage(1, 21, 21);
daccounts.check_storage(2, 31, 31);

assert_eq!(
daccounts.update_accounts_hash_for_tests(latest_slot, &ancestors, false, false,),
Expand Down
Loading