From fac76715e9d752df3da459e0fdcc51a7ed6dc6fd Mon Sep 17 00:00:00 2001 From: Xiang Zhu Date: Tue, 4 Apr 2023 17:10:56 -0700 Subject: [PATCH] bank_from_snapshot_dir returns BankFromDirTimings (#31051) --- runtime/src/snapshot_utils.rs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/runtime/src/snapshot_utils.rs b/runtime/src/snapshot_utils.rs index 36feef1f36..0850de933d 100644 --- a/runtime/src/snapshot_utils.rs +++ b/runtime/src/snapshot_utils.rs @@ -1334,6 +1334,12 @@ pub struct BankFromArchiveTimings { 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. const PARALLEL_UNTAR_READERS_DEFAULT: usize = 4; @@ -1659,7 +1665,7 @@ pub fn bank_from_snapshot_dir( accounts_db_config: Option, accounts_update_notifier: Option, exit: &Arc, -) -> Result<(Bank, BankFromArchiveTimings)> { +) -> Result<(Bank, BankFromDirTimings)> { let next_append_vec_id = Arc::new(AtomicAppendVecId::new(0)); let (storage, measure_build_storage) = measure!( @@ -1698,11 +1704,9 @@ pub fn bank_from_snapshot_dir( // will calculate and check the accounts hash, so we will still have safety/correctness there. bank.set_initial_accounts_hash_verification_completed(); - let timings = BankFromArchiveTimings { - rebuild_bank_from_snapshots_us: measure_rebuild.as_us(), - full_snapshot_untar_us: measure_build_storage.as_us(), - incremental_snapshot_untar_us: 0, - verify_snapshot_bank_us: 0, + let timings = BankFromDirTimings { + rebuild_bank_from_snapshot_us: measure_rebuild.as_us(), + build_storage_us: measure_build_storage.as_us(), }; Ok((bank, timings)) }