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

Check bank capitalization #10937

Closed
wants to merge 1 commit into from
Closed

Check bank capitalization #10937

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
7 changes: 6 additions & 1 deletion accounts-bench/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ use solana_runtime::{
accounts_index::Ancestors,
};
use solana_sdk::pubkey::Pubkey;
use std::collections::HashSet;
use std::fs;
use std::path::PathBuf;

Expand Down Expand Up @@ -83,6 +84,7 @@ fn main() {
ancestors.insert(i as u64, i - 1);
accounts.add_root(i as u64);
}
let cap_exempt = HashSet::new();
for x in 0..iterations {
if clean {
let mut time = Measure::start("clean");
Expand All @@ -96,7 +98,10 @@ fn main() {
} else {
let mut pubkeys: Vec<Pubkey> = vec![];
let mut time = Measure::start("hash");
let hash = accounts.accounts_db.update_accounts_hash(0, &ancestors);
let hash = accounts
.accounts_db
.update_accounts_hash(0, &ancestors, &cap_exempt)
.0;
time.stop();
println!("hash: {} {}", hash, time);
create_test_accounts(&accounts, &mut pubkeys, 1, 0);
Expand Down
19 changes: 15 additions & 4 deletions runtime/benches/accounts.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use solana_runtime::{
bank::*,
};
use solana_sdk::{account::Account, genesis_config::create_genesis_config, pubkey::Pubkey};
use std::collections::HashSet;
use std::{path::PathBuf, sync::Arc};
use test::Bencher;

Expand Down Expand Up @@ -67,10 +68,17 @@ fn test_accounts_squash(bencher: &mut Bencher) {
fn test_accounts_hash_bank_hash(bencher: &mut Bencher) {
let accounts = Accounts::new(vec![PathBuf::from("bench_accounts_hash_internal")]);
let mut pubkeys: Vec<Pubkey> = vec![];
create_test_accounts(&accounts, &mut pubkeys, 60000, 0);
let num_accounts = 60_000;
let slot = 0;
create_test_accounts(&accounts, &mut pubkeys, num_accounts, slot);
let ancestors = vec![(0, 0)].into_iter().collect();
accounts.accounts_db.update_accounts_hash(0, &ancestors);
bencher.iter(|| assert!(accounts.verify_bank_hash(0, &ancestors)));
let cap_exempt = HashSet::new();
let (_, total_lamports) = accounts
.accounts_db
.update_accounts_hash(0, &ancestors, &cap_exempt);
bencher.iter(|| {
assert!(accounts.verify_bank_hash_and_lamports(0, &ancestors, total_lamports, &cap_exempt))
});
}

#[bench]
Expand All @@ -80,8 +88,11 @@ fn test_update_accounts_hash(bencher: &mut Bencher) {
let mut pubkeys: Vec<Pubkey> = vec![];
create_test_accounts(&accounts, &mut pubkeys, 50_000, 0);
let ancestors = vec![(0, 0)].into_iter().collect();
let cap_exempt = HashSet::new();
bencher.iter(|| {
accounts.accounts_db.update_accounts_hash(0, &ancestors);
accounts
.accounts_db
.update_accounts_hash(0, &ancestors, &cap_exempt);
});
}

Expand Down
15 changes: 13 additions & 2 deletions runtime/src/accounts.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,8 +428,19 @@ impl Accounts {
}

#[must_use]
pub fn verify_bank_hash(&self, slot: Slot, ancestors: &Ancestors) -> bool {
if let Err(err) = self.accounts_db.verify_bank_hash(slot, ancestors) {
pub fn verify_bank_hash_and_lamports(
&self,
slot: Slot,
ancestors: &Ancestors,
total_lamports: u64,
capitalization_exempt: &HashSet<Pubkey>,
) -> bool {
if let Err(err) = self.accounts_db.verify_bank_hash_and_lamports(
slot,
ancestors,
total_lamports,
capitalization_exempt,
) {
warn!("verify_bank_hash failed: {:?}", err);
false
} else {
Expand Down
90 changes: 65 additions & 25 deletions runtime/src/accounts_db.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ pub enum BankHashVerificationError {
MismatchedAccountHash,
MismatchedBankHash,
MissingBankHash,
MismatchedTotalLamports,
}

/// Persistent storage structure holding the accounts
Expand Down Expand Up @@ -1545,13 +1546,15 @@ impl AccountsDB {
&self,
ancestors: &Ancestors,
check_hash: bool,
) -> Result<Hash, BankHashVerificationError> {
capitalization_exempt: &HashSet<Pubkey>,
) -> Result<(Hash, u64), BankHashVerificationError> {
use BankHashVerificationError::*;
let mut scan = Measure::start("scan");
let accounts_index = self.accounts_index.read().unwrap();
let storage = self.storage.read().unwrap();
let keys: Vec<_> = accounts_index.account_maps.keys().collect();
let mismatch_found = AtomicU64::new(0);
let total_lamports = AtomicU64::new(0);
let hashes: Vec<_> = keys
.par_iter()
.filter_map(|pubkey| {
Expand All @@ -1564,6 +1567,12 @@ impl AccountsDB {
.and_then(|storage_map| storage_map.get(&account_info.store_id))
.and_then(|store| {
let account = store.accounts.get_account(account_info.offset)?.0;
if !(solana_sdk::sysvar::check_id(&account.account_meta.owner)
|| capitalization_exempt.contains(&pubkey))
{
total_lamports
.fetch_add(account_info.lamports, Ordering::Relaxed);
}

if check_hash {
let hash = Self::hash_stored_account(*slot, &account);
Expand Down Expand Up @@ -1603,7 +1612,7 @@ impl AccountsDB {
("hash_accumulate", accumulate.as_us(), i64),
("hash_total", hash_total, i64),
);
Ok(accumulated_hash)
Ok((accumulated_hash, total_lamports.load(Ordering::Relaxed)))
}

pub fn get_accounts_hash(&self, slot: Slot) -> Hash {
Expand All @@ -1612,22 +1621,40 @@ impl AccountsDB {
bank_hash_info.snapshot_hash
}

pub fn update_accounts_hash(&self, slot: Slot, ancestors: &Ancestors) -> Hash {
let hash = self.calculate_accounts_hash(ancestors, false).unwrap();
pub fn update_accounts_hash(
&self,
slot: Slot,
ancestors: &Ancestors,
capitalization_exempt: &HashSet<Pubkey>,
) -> (Hash, u64) {
let (hash, total_lamports) = self
.calculate_accounts_hash(ancestors, false, capitalization_exempt)
.unwrap();
let mut bank_hashes = self.bank_hashes.write().unwrap();
let mut bank_hash_info = bank_hashes.get_mut(&slot).unwrap();
bank_hash_info.snapshot_hash = hash;
hash
(hash, total_lamports)
}

pub fn verify_bank_hash(
pub fn verify_bank_hash_and_lamports(
&self,
slot: Slot,
ancestors: &Ancestors,
total_lamports: u64,
capitalization_exempt: &HashSet<Pubkey>,
) -> Result<(), BankHashVerificationError> {
use BankHashVerificationError::*;

let calculated_hash = self.calculate_accounts_hash(ancestors, true)?;
let (calculated_hash, calculated_lamports) =
self.calculate_accounts_hash(ancestors, true, capitalization_exempt)?;

if calculated_lamports != total_lamports {
warn!(
"Mismatched total lamports: {} calculated: {}",
total_lamports, calculated_lamports
);
return Err(MismatchedTotalLamports);
}

let bank_hashes = self.bank_hashes.read().unwrap();
if let Some(found_hash_info) = bank_hashes.get(&slot) {
Expand Down Expand Up @@ -2901,8 +2928,8 @@ pub mod tests {

let ancestors = linear_ancestors(latest_slot);
assert_eq!(
daccounts.update_accounts_hash(latest_slot, &ancestors),
accounts.update_accounts_hash(latest_slot, &ancestors)
daccounts.update_accounts_hash(latest_slot, &ancestors, &HashSet::new()),
accounts.update_accounts_hash(latest_slot, &ancestors, &HashSet::new())
);
}

Expand Down Expand Up @@ -3035,13 +3062,13 @@ pub mod tests {

let ancestors = linear_ancestors(current_slot);
info!("ancestors: {:?}", ancestors);
let hash = accounts.update_accounts_hash(current_slot, &ancestors);
let hash = accounts.update_accounts_hash(current_slot, &ancestors, &HashSet::new());

accounts.clean_accounts();
accounts.process_dead_slots(None);

assert_eq!(
accounts.update_accounts_hash(current_slot, &ancestors),
accounts.update_accounts_hash(current_slot, &ancestors, &HashSet::new()),
hash
);

Expand Down Expand Up @@ -3162,7 +3189,7 @@ pub mod tests {
accounts.add_root(current_slot);

accounts.print_accounts_stats("pre_f");
accounts.update_accounts_hash(4, &HashMap::default());
accounts.update_accounts_hash(4, &HashMap::default(), &HashSet::new());

let accounts = f(accounts, current_slot);

Expand All @@ -3173,7 +3200,9 @@ pub mod tests {
assert_load_account(&accounts, current_slot, purged_pubkey2, 0);
assert_load_account(&accounts, current_slot, dummy_pubkey, dummy_lamport);

accounts.verify_bank_hash(4, &HashMap::default()).unwrap();
accounts
.verify_bank_hash_and_lamports(4, &HashMap::default(), 1222, &HashSet::new())
.unwrap();
}

#[test]
Expand Down Expand Up @@ -3552,25 +3581,33 @@ pub mod tests {
}

#[test]
fn test_verify_bank_hash() {
fn test_verify_bank_hash1() {
use BankHashVerificationError::*;
solana_logger::setup();
let db = AccountsDB::new(Vec::new());

let key = Pubkey::default();
let key = Pubkey::new_rand();
let some_data_len = 0;
let some_slot: Slot = 0;
let account = Account::new(1, some_data_len, &key);
let ancestors = vec![(some_slot, 0)].into_iter().collect();

db.store(some_slot, &[(&key, &account)]);
db.add_root(some_slot);
db.update_accounts_hash(some_slot, &ancestors);
assert_matches!(db.verify_bank_hash(some_slot, &ancestors), Ok(_));
db.update_accounts_hash(some_slot, &ancestors, &HashSet::new());
assert_matches!(
db.verify_bank_hash_and_lamports(some_slot, &ancestors, 1, &HashSet::new()),
Ok(_)
);

assert_matches!(
db.verify_bank_hash_and_lamports(some_slot, &ancestors, 10, &HashSet::new()),
Err(MismatchedTotalLamports)
);

db.bank_hashes.write().unwrap().remove(&some_slot).unwrap();
assert_matches!(
db.verify_bank_hash(some_slot, &ancestors),
db.verify_bank_hash_and_lamports(some_slot, &ancestors, 1, &HashSet::new()),
Err(MissingBankHash)
);

Expand All @@ -3585,7 +3622,7 @@ pub mod tests {
.unwrap()
.insert(some_slot, bank_hash_info);
assert_matches!(
db.verify_bank_hash(some_slot, &ancestors),
db.verify_bank_hash_and_lamports(some_slot, &ancestors, 1, &HashSet::new()),
Err(MismatchedBankHash)
);
}
Expand All @@ -3603,8 +3640,11 @@ pub mod tests {
.unwrap()
.insert(some_slot, BankHashInfo::default());
db.add_root(some_slot);
db.update_accounts_hash(some_slot, &ancestors);
assert_matches!(db.verify_bank_hash(some_slot, &ancestors), Ok(_));
db.update_accounts_hash(some_slot, &ancestors, &HashSet::new());
assert_matches!(
db.verify_bank_hash_and_lamports(some_slot, &ancestors, 0, &HashSet::new()),
Ok(_)
);
}

#[test]
Expand All @@ -3627,7 +3667,7 @@ pub mod tests {
db.store_with_hashes(some_slot, accounts, &[some_hash]);
db.add_root(some_slot);
assert_matches!(
db.verify_bank_hash(some_slot, &ancestors),
db.verify_bank_hash_and_lamports(some_slot, &ancestors, 1, &HashSet::new()),
Err(MismatchedAccountHash)
);
}
Expand Down Expand Up @@ -4045,14 +4085,14 @@ pub mod tests {
);

let no_ancestors = HashMap::default();
accounts.update_accounts_hash(current_slot, &no_ancestors);
accounts.update_accounts_hash(current_slot, &no_ancestors, &HashSet::new());
accounts
.verify_bank_hash(current_slot, &no_ancestors)
.verify_bank_hash_and_lamports(current_slot, &no_ancestors, 22300, &HashSet::new())
.unwrap();

let accounts = reconstruct_accounts_db_via_serialization(&accounts, current_slot);
accounts
.verify_bank_hash(current_slot, &no_ancestors)
.verify_bank_hash_and_lamports(current_slot, &no_ancestors, 22300, &HashSet::new())
.unwrap();

// repeating should be no-op
Expand Down
Loading