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

Revert "avoid adding to 'uncleaned_roots' when generating index and c… (#26441) 

Revert "avoid adding to 'uncleaned_roots' when generating index and caller passes accounts-db-skip-shrink (#25936)"

This reverts commit e24cc537a4.
This commit is contained in:
Jeff Washington (jwash) 2022-07-06 11:32:45 -05:00 committed by GitHub
parent ab164fc975
commit 17a99d98dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
runtime/src/accounts_db.rs
View File

@ -8142,7 +8142,6 @@ impl AccountsDb {
limit_load_slot_count_from_snapshot: Option<usize>,
verify: bool,
genesis_config: &GenesisConfig,
accounts_db_skip_shrink: bool,
) -> IndexGenerationInfo {
let mut slots = self.storage.all_slots();
#[allow(clippy::stable_sort_primitive)]
@ -8345,12 +8344,7 @@ impl AccountsDb {
if pass == 0 {
// Need to add these last, otherwise older updates will be cleaned
for slot in &slots {
// passing 'false' to 'add_root' causes all slots to be added to 'uncleaned_slots'
// passing 'true' to 'add_root' does NOT add all slots to 'uncleaned_slots'
// if we are skipping shrink, this potentially massive amount of work is never processed at startup, when all threads can be used.
// This causes failures such as oom during the first bg clean, which is expecting to work in 'normal' operating circumstances.
// So, don't add all slots to 'uncleaned_slots' here since by requesting to skip clean and shrink, caller is expecting the starting snapshot to be reasonable.
self.accounts_index.add_root(*slot, accounts_db_skip_shrink);
self.accounts_index.add_root(*slot, false);
}
self.set_storage_count_and_alive_bytes(storage_info, &mut timings);

18
runtime/src/bank.rs
View File

@ -6921,21 +6921,9 @@ impl Bank {
last_full_snapshot_slot: Option<Slot>,
) -> bool {
let mut clean_time = Measure::start("clean");
if !accounts_db_skip_shrink {
if self.slot() > 0 {
info!("cleaning..");
self.clean_accounts(true, true, last_full_snapshot_slot);
}
} else {
// if we are skipping shrink, there should be no uncleaned_roots deferred to later
assert_eq!(
self.rc
.accounts
.accounts_db
.accounts_index
.uncleaned_roots_len(),
0
);
if !accounts_db_skip_shrink && self.slot() > 0 {
info!("cleaning..");
self.clean_accounts(true, true, last_full_snapshot_slot);
}
clean_time.stop();

6
runtime/src/serde_snapshot.rs
View File

@ -242,7 +242,6 @@ pub(crate) fn bank_from_streams<R>(
verify_index: bool,
accounts_db_config: Option<AccountsDbConfig>,
accounts_update_notifier: Option<AccountsUpdateNotifier>,
accounts_db_skip_shrink: bool,
) -> std::result::Result<Bank, Error>
where
R: Read,
@ -294,7 +293,6 @@ where
verify_index,
accounts_db_config,
accounts_update_notifier,
accounts_db_skip_shrink,
)
}
@ -475,7 +473,6 @@ fn reconstruct_bank_from_fields<E>(
verify_index: bool,
accounts_db_config: Option<AccountsDbConfig>,
accounts_update_notifier: Option<AccountsUpdateNotifier>,
accounts_db_skip_shrink: bool,
) -> Result<Bank, Error>
where
E: SerializableStorage + std::marker::Sync,
@ -492,7 +489,6 @@ where
verify_index,
accounts_db_config,
accounts_update_notifier,
accounts_db_skip_shrink,
)?;
let bank_rc = BankRc::new(Accounts::new_empty(accounts_db), bank_fields.slot);
@ -552,7 +548,6 @@ fn reconstruct_accountsdb_from_fields<E>(
verify_index: bool,
accounts_db_config: Option<AccountsDbConfig>,
accounts_update_notifier: Option<AccountsUpdateNotifier>,
accounts_db_skip_shrink: bool,
) -> Result<(AccountsDb, ReconstructedAccountsDbInfo), Error>
where
E: SerializableStorage + std::marker::Sync,
@ -702,7 +697,6 @@ where
limit_load_slot_count_from_snapshot,
verify_index,
genesis_config,
accounts_db_skip_shrink,
);
accounts_db.maybe_add_filler_accounts(

4
runtime/src/serde_snapshot/tests.rs
View File

@ -90,7 +90,6 @@ where
false,
Some(crate::accounts_db::ACCOUNTS_DB_CONFIG_FOR_TESTING),
None,
false,
)
.map(|(accounts_db, _)| accounts_db)
}
@ -303,7 +302,6 @@ fn test_bank_serialize_style(
false,
Some(crate::accounts_db::ACCOUNTS_DB_CONFIG_FOR_TESTING),
None,
false,
)
.unwrap();
dbank.status_cache = Arc::new(RwLock::new(status_cache));
@ -419,7 +417,6 @@ fn test_extra_fields_eof() {
false,
Some(crate::accounts_db::ACCOUNTS_DB_CONFIG_FOR_TESTING),
None,
false,
)
.unwrap();
@ -541,7 +538,6 @@ fn test_blank_extra_fields() {
false,
Some(crate::accounts_db::ACCOUNTS_DB_CONFIG_FOR_TESTING),
None,
false,
)
.unwrap();

8
runtime/src/snapshot_utils.rs
View File

@ -821,9 +821,6 @@ pub fn bank_from_snapshot_archives(
incremental_snapshot_archive_info,
)?;
let accounts_db_skip_shrink =
accounts_db_skip_shrink || !full_snapshot_archive_info.is_remote();
let parallel_divisions = std::cmp::min(
PARALLEL_UNTAR_READERS_DEFAULT,
std::cmp::max(1, num_cpus::get() / 4),
@ -882,7 +879,6 @@ pub fn bank_from_snapshot_archives(
verify_index,
accounts_db_config,
accounts_update_notifier,
accounts_db_skip_shrink,
)?;
measure_rebuild.stop();
info!("{}", measure_rebuild);
@ -890,7 +886,7 @@ pub fn bank_from_snapshot_archives(
let mut measure_verify = Measure::start("verify");
if !bank.verify_snapshot_bank(
test_hash_calculation,
accounts_db_skip_shrink,
accounts_db_skip_shrink || !full_snapshot_archive_info.is_remote(),
Some(full_snapshot_archive_info.slot()),
) && limit_load_slot_count_from_snapshot.is_none()
{
@ -1579,7 +1575,6 @@ fn rebuild_bank_from_snapshots(
verify_index: bool,
accounts_db_config: Option<AccountsDbConfig>,
accounts_update_notifier: Option<AccountsUpdateNotifier>,
accounts_db_skip_shrink: bool,
) -> Result<Bank> {
let (full_snapshot_version, full_snapshot_root_paths) =
verify_unpacked_snapshots_dir_and_version(
@ -1628,7 +1623,6 @@ fn rebuild_bank_from_snapshots(
verify_index,
accounts_db_config,
accounts_update_notifier,
accounts_db_skip_shrink,
),
}?,
)