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

Refactors common accounts hash calculation config in AccountsHashVerifier (#30677) 

* Refactors common accounts hash calculation config in AccountsHashVerifier

* pr: config var
This commit is contained in:
Brooks 2023-03-13 15:39:28 -04:00 committed by GitHub
parent a791e1b541
commit 346021a48c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
core/src/accounts_hash_verifier.rs
View File

@ -222,18 +222,20 @@ impl AccountsHashVerifier {
}; };
timings.calc_storage_size_quartiles(&accounts_package.snapshot_storages); timings.calc_storage_size_quartiles(&accounts_package.snapshot_storages);
let calculate_accounts_hash_config = CalcAccountsHashConfig {
use_bg_thread_pool: true,
check_hash: false,
ancestors: None,
epoch_schedule: &accounts_package.epoch_schedule,
rent_collector: &accounts_package.rent_collector,
store_detailed_debug_info_on_failure: false,
};
let (accounts_hash, lamports) = accounts_package let (accounts_hash, lamports) = accounts_package
.accounts .accounts
.accounts_db .accounts_db
.calculate_accounts_hash_from_storages( .calculate_accounts_hash_from_storages(
&CalcAccountsHashConfig { &calculate_accounts_hash_config,
use_bg_thread_pool: true,
check_hash: false,
ancestors: None,
epoch_schedule: &accounts_package.epoch_schedule,
rent_collector: &accounts_package.rent_collector,
store_detailed_debug_info_on_failure: false,
},
&sorted_storages, &sorted_storages,
timings, timings,
) )
@ -253,37 +255,32 @@ impl AccountsHashVerifier {
if accounts_package.expected_capitalization != lamports { if accounts_package.expected_capitalization != lamports {
// before we assert, run the hash calc again. This helps track down whether it could have been a failure in a race condition possibly with shrink. // before we assert, run the hash calc again. This helps track down whether it could have been a failure in a race condition possibly with shrink.
// We could add diagnostics to the hash calc here to produce a per bin cap or something to help narrow down how many pubkeys are different. // We could add diagnostics to the hash calc here to produce a per bin cap or something to help narrow down how many pubkeys are different.
let calculate_accounts_hash_config = CalcAccountsHashConfig {
// since we're going to assert, use the fg thread pool to go faster
use_bg_thread_pool: false,
..calculate_accounts_hash_config
};
let result_with_index = accounts_package let result_with_index = accounts_package
.accounts .accounts
.accounts_db .accounts_db
.calculate_accounts_hash_from_index( .calculate_accounts_hash_from_index(
accounts_package.slot, accounts_package.slot,
&CalcAccountsHashConfig { &calculate_accounts_hash_config,
use_bg_thread_pool: false,
check_hash: false,
ancestors: None,
epoch_schedule: &accounts_package.epoch_schedule,
rent_collector: &accounts_package.rent_collector,
store_detailed_debug_info_on_failure: false,
},
); );
info!( info!(
"hash calc with index: {}, {:?}", "hash calc with index: {}, {result_with_index:?}",
accounts_package.slot, result_with_index accounts_package.slot
); );
let _ = accounts_package let calculate_accounts_hash_config = CalcAccountsHashConfig {
// now that we've failed, store off the failing contents that produced a bad capitalization
store_detailed_debug_info_on_failure: true,
..calculate_accounts_hash_config
};
_ = accounts_package
.accounts .accounts
.accounts_db .accounts_db
.calculate_accounts_hash_from_storages( .calculate_accounts_hash_from_storages(
&CalcAccountsHashConfig { &calculate_accounts_hash_config,
use_bg_thread_pool: false,
check_hash: false,
ancestors: None,
epoch_schedule: &accounts_package.epoch_schedule,
rent_collector: &accounts_package.rent_collector,
// now that we've failed, store off the failing contents that produced a bad capitalization
store_detailed_debug_info_on_failure: true,
},
&sorted_storages, &sorted_storages,
HashStats::default(), HashStats::default(),
); );