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

Fixes BankFrom.*Timings (#34249)

This commit is contained in:
Brooks 2023-11-28 13:05:54 -05:00 committed by GitHub
parent 4d2018fc6e
commit b9ef204faf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 68 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
runtime/src/snapshot_bank_utils.rs
View File

@ -13,16 +13,16 @@ use {
snapshot_hash::SnapshotHash, snapshot_hash::SnapshotHash,
snapshot_package::{AccountsPackage, AccountsPackageKind, SnapshotKind, SnapshotPackage}, snapshot_package::{AccountsPackage, AccountsPackageKind, SnapshotKind, SnapshotPackage},
snapshot_utils::{ snapshot_utils::{
self, archive_snapshot_package, build_storage_from_snapshot_dir, self, archive_snapshot_package, delete_contents_of_path,
delete_contents_of_path, deserialize_snapshot_data_file, deserialize_snapshot_data_file, deserialize_snapshot_data_files, get_bank_snapshot_dir,
deserialize_snapshot_data_files, get_bank_snapshot_dir, get_highest_bank_snapshot_post, get_highest_bank_snapshot_post, get_highest_full_snapshot_archive_info,
get_highest_full_snapshot_archive_info, get_highest_incremental_snapshot_archive_info, get_highest_incremental_snapshot_archive_info, get_snapshot_file_name,
get_snapshot_file_name, get_storages_to_serialize, hard_link_storages_to_snapshot, get_storages_to_serialize, hard_link_storages_to_snapshot,
serialize_snapshot_data_file, verify_and_unarchive_snapshots, rebuild_storages_from_snapshot_dir, serialize_snapshot_data_file,
verify_unpacked_snapshots_dir_and_version, write_snapshot_version_file, verify_and_unarchive_snapshots, verify_unpacked_snapshots_dir_and_version,
AddBankSnapshotError, ArchiveFormat, BankSnapshotInfo, BankSnapshotType, SnapshotError, write_snapshot_version_file, AddBankSnapshotError, ArchiveFormat, BankSnapshotInfo,
SnapshotRootPaths, SnapshotVersion, StorageAndNextAppendVecId, BankSnapshotType, SnapshotError, SnapshotRootPaths, SnapshotVersion,
UnpackedSnapshotsDirAndVersion, VerifySlotDeltasError, StorageAndNextAppendVecId, UnpackedSnapshotsDirAndVersion, VerifySlotDeltasError,
}, },
status_cache, status_cache,
}, },
@ -202,18 +202,18 @@ fn serialize_status_cache(
}) })
} }
#[derive(Debug, Default)] #[derive(Debug)]
pub struct BankFromArchiveTimings { pub struct BankFromArchivesTimings {
pub rebuild_bank_from_snapshots_us: u64, pub untar_full_snapshot_archive_us: u64,
pub full_snapshot_untar_us: u64, pub untar_incremental_snapshot_archive_us: u64,
pub incremental_snapshot_untar_us: u64, pub rebuild_bank_us: u64,
pub verify_snapshot_bank_us: u64, pub verify_bank_us: u64,
} }
#[derive(Debug, Default)] #[derive(Debug)]
pub struct BankFromDirTimings { pub struct BankFromDirTimings {
pub rebuild_bank_from_snapshot_us: u64, pub rebuild_storages_us: u64,
pub build_storage_us: u64, pub rebuild_bank_us: u64,
} }
/// Utility for parsing out bank specific information from a snapshot archive. This utility can be used /// Utility for parsing out bank specific information from a snapshot archive. This utility can be used
@ -276,7 +276,7 @@ pub fn bank_from_snapshot_archives(
accounts_db_config: Option<AccountsDbConfig>, accounts_db_config: Option<AccountsDbConfig>,
accounts_update_notifier: Option<AccountsUpdateNotifier>, accounts_update_notifier: Option<AccountsUpdateNotifier>,
exit: Arc<AtomicBool>, exit: Arc<AtomicBool>,
) -> snapshot_utils::Result<(Bank, BankFromArchiveTimings)> { ) -> snapshot_utils::Result<(Bank, BankFromArchivesTimings)> {
info!( info!(
"Loading bank from full snapshot archive: {}, and incremental snapshot archive: {:?}", "Loading bank from full snapshot archive: {}, and incremental snapshot archive: {:?}",
full_snapshot_archive_info.path().display(), full_snapshot_archive_info.path().display(),
@ -375,37 +375,29 @@ pub fn bank_from_snapshot_archives(
} }
measure_verify.stop(); measure_verify.stop();
let timings = BankFromArchiveTimings { let timings = BankFromArchivesTimings {
rebuild_bank_from_snapshots_us: measure_rebuild.as_us(), untar_full_snapshot_archive_us: unarchived_full_snapshot.measure_untar.as_us(),
full_snapshot_untar_us: unarchived_full_snapshot.measure_untar.as_us(), untar_incremental_snapshot_archive_us: unarchived_incremental_snapshot
incremental_snapshot_untar_us: unarchived_incremental_snapshot
.map_or(0, |unarchive_preparation_result| { .map_or(0, |unarchive_preparation_result| {
unarchive_preparation_result.measure_untar.as_us() unarchive_preparation_result.measure_untar.as_us()
}), }),
verify_snapshot_bank_us: measure_verify.as_us(), rebuild_bank_us: measure_rebuild.as_us(),
verify_bank_us: measure_verify.as_us(),
}; };
datapoint_info!( datapoint_info!(
"bank_from_snapshot_archives", "bank_from_snapshot_archives",
( (
"full_snapshot_untar_us", "untar_full_snapshot_archive_us",
timings.full_snapshot_untar_us, timings.untar_full_snapshot_archive_us,
i64 i64
), ),
( (
"incremental_snapshot_untar_us", "untar_incremental_snapshot_archive_us",
timings.incremental_snapshot_untar_us, timings.untar_incremental_snapshot_archive_us,
i64
),
(
"rebuild_bank_from_snapshots_us",
timings.rebuild_bank_from_snapshots_us,
i64
),
(
"verify_snapshot_bank_us",
timings.verify_snapshot_bank_us,
i64 i64
), ),
("rebuild_bank_us", timings.rebuild_bank_us, i64),
("verify_bank_us", timings.verify_bank_us, i64),
); );
Ok((bank, timings)) Ok((bank, timings))
} }
@ -506,11 +498,15 @@ pub fn bank_from_snapshot_dir(
let next_append_vec_id = Arc::new(AtomicAppendVecId::new(0)); let next_append_vec_id = Arc::new(AtomicAppendVecId::new(0));
let (storage, measure_build_storage) = measure!( let (storage, measure_rebuild_storages) = measure!(
build_storage_from_snapshot_dir(bank_snapshot, account_paths, next_append_vec_id.clone())?, rebuild_storages_from_snapshot_dir(
"build storage from snapshot dir" bank_snapshot,
account_paths,
next_append_vec_id.clone()
)?,
"rebuild storages from snapshot dir"
); );
info!("{}", measure_build_storage); info!("{}", measure_rebuild_storages);
let next_append_vec_id = let next_append_vec_id =
Arc::try_unwrap(next_append_vec_id).expect("this is the only strong reference"); Arc::try_unwrap(next_append_vec_id).expect("this is the only strong reference");
@ -518,8 +514,8 @@ pub fn bank_from_snapshot_dir(
storage, storage,
next_append_vec_id, next_append_vec_id,
}; };
let mut measure_rebuild = Measure::start("rebuild bank from snapshot"); let (bank, measure_rebuild_bank) = measure!(
let bank = rebuild_bank_from_snapshot( rebuild_bank_from_snapshot(
bank_snapshot, bank_snapshot,
account_paths, account_paths,
storage_and_next_append_vec_id, storage_and_next_append_vec_id,
@ -534,30 +530,23 @@ pub fn bank_from_snapshot_dir(
accounts_db_config, accounts_db_config,
accounts_update_notifier, accounts_update_notifier,
exit, exit,
)?; )?,
measure_rebuild.stop(); "rebuild bank from snapshot"
info!("{}", measure_rebuild); );
info!("{}", measure_rebuild_bank);
// Skip bank.verify_snapshot_bank. Subsequent snapshot requests/accounts hash verification requests // Skip bank.verify_snapshot_bank. Subsequent snapshot requests/accounts hash verification requests
// will calculate and check the accounts hash, so we will still have safety/correctness there. // will calculate and check the accounts hash, so we will still have safety/correctness there.
bank.set_initial_accounts_hash_verification_completed(); bank.set_initial_accounts_hash_verification_completed();
let timings = BankFromDirTimings { let timings = BankFromDirTimings {
rebuild_bank_from_snapshot_us: measure_rebuild.as_us(), rebuild_storages_us: measure_rebuild_storages.as_us(),
build_storage_us: measure_build_storage.as_us(), rebuild_bank_us: measure_rebuild_bank.as_us(),
}; };
datapoint_info!( datapoint_info!(
"bank_from_snapshot_dir", "bank_from_snapshot_dir",
( ("rebuild_storages_us", timings.rebuild_storages_us, i64),
"build_storage_from_snapshot_dir_us", ("rebuild_bank_us", timings.rebuild_bank_us, i64),
timings.build_storage_us,
i64
),
(
"rebuild_bank_from_snapshot_us",
timings.rebuild_bank_from_snapshot_us,
i64
),
); );
Ok((bank, timings)) Ok((bank, timings))
} }

22
runtime/src/snapshot_utils.rs
View File

@ -1211,20 +1211,6 @@ pub(crate) fn get_storages_to_serialize(
.collect::<Vec<_>>() .collect::<Vec<_>>()
} }
#[derive(Debug, Default)]
pub struct BankFromArchiveTimings {
pub rebuild_bank_from_snapshots_us: u64,
pub full_snapshot_untar_us: u64,
pub incremental_snapshot_untar_us: u64,
pub verify_snapshot_bank_us: u64,
}
#[derive(Debug, Default)]
pub struct BankFromDirTimings {
pub rebuild_bank_from_snapshot_us: u64,
pub build_storage_us: u64,
}
// From testing, 4 seems to be a sweet spot for ranges of 60M-360M accounts and 16-64 cores. This may need to be tuned later. // From testing, 4 seems to be a sweet spot for ranges of 60M-360M accounts and 16-64 cores. This may need to be tuned later.
const PARALLEL_UNTAR_READERS_DEFAULT: usize = 4; const PARALLEL_UNTAR_READERS_DEFAULT: usize = 4;
@ -1461,9 +1447,11 @@ fn streaming_snapshot_dir_files(
Ok(()) Ok(())
} }
/// Perform the common tasks when deserialize a snapshot. Handles reading snapshot file, reading the version file, /// Performs the common tasks when deserializing a snapshot
/// and then returning those fields plus the rebuilt storage ///
pub fn build_storage_from_snapshot_dir( /// Handles reading the snapshot file and version file,
/// then returning those fields plus the rebuilt storages.
pub fn rebuild_storages_from_snapshot_dir(
snapshot_info: &BankSnapshotInfo, snapshot_info: &BankSnapshotInfo,
account_paths: &[PathBuf], account_paths: &[PathBuf],
next_append_vec_id: Arc<AtomicAppendVecId>, next_append_vec_id: Arc<AtomicAppendVecId>,