Remove BankFromArchiveTimings from ledger/
This commit is contained in:
parent
9cfa21f7d1
commit
5599bd9442
|
@ -143,7 +143,7 @@ fn load_from_snapshot(
|
||||||
process::exit(1);
|
process::exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
let (deserialized_bank, timings, full_snapshot_archive_info, incremental_snapshot_archive_info) =
|
let (deserialized_bank, full_snapshot_archive_info, incremental_snapshot_archive_info) =
|
||||||
snapshot_utils::bank_from_latest_snapshot_archives(
|
snapshot_utils::bank_from_latest_snapshot_archives(
|
||||||
&snapshot_config.bank_snapshots_dir,
|
&snapshot_config.bank_snapshots_dir,
|
||||||
&snapshot_config.snapshot_archives_dir,
|
&snapshot_config.snapshot_archives_dir,
|
||||||
|
@ -199,7 +199,6 @@ fn load_from_snapshot(
|
||||||
cache_block_meta_sender,
|
cache_block_meta_sender,
|
||||||
Some(snapshot_config),
|
Some(snapshot_config),
|
||||||
accounts_package_sender,
|
accounts_package_sender,
|
||||||
timings,
|
|
||||||
full_snapshot_archive_info.slot(),
|
full_snapshot_archive_info.slot(),
|
||||||
),
|
),
|
||||||
Some(starting_snapshot_hashes),
|
Some(starting_snapshot_hashes),
|
||||||
|
|
|
@ -31,7 +31,7 @@ use {
|
||||||
cost_model::CostModel,
|
cost_model::CostModel,
|
||||||
snapshot_config::SnapshotConfig,
|
snapshot_config::SnapshotConfig,
|
||||||
snapshot_package::{AccountsPackageSender, SnapshotType},
|
snapshot_package::{AccountsPackageSender, SnapshotType},
|
||||||
snapshot_utils::{self, BankFromArchiveTimings},
|
snapshot_utils,
|
||||||
transaction_batch::TransactionBatch,
|
transaction_batch::TransactionBatch,
|
||||||
transaction_cost_metrics_sender::TransactionCostMetricsSender,
|
transaction_cost_metrics_sender::TransactionCostMetricsSender,
|
||||||
vote_account::VoteAccount,
|
vote_account::VoteAccount,
|
||||||
|
@ -610,7 +610,6 @@ pub fn process_blockstore(
|
||||||
cache_block_meta_sender,
|
cache_block_meta_sender,
|
||||||
snapshot_config,
|
snapshot_config,
|
||||||
accounts_package_sender,
|
accounts_package_sender,
|
||||||
BankFromArchiveTimings::default(),
|
|
||||||
None,
|
None,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -626,7 +625,6 @@ pub(crate) fn process_blockstore_from_root(
|
||||||
cache_block_meta_sender: Option<&CacheBlockMetaSender>,
|
cache_block_meta_sender: Option<&CacheBlockMetaSender>,
|
||||||
snapshot_config: Option<&SnapshotConfig>,
|
snapshot_config: Option<&SnapshotConfig>,
|
||||||
accounts_package_sender: AccountsPackageSender,
|
accounts_package_sender: AccountsPackageSender,
|
||||||
timings: BankFromArchiveTimings,
|
|
||||||
last_full_snapshot_slot: Slot,
|
last_full_snapshot_slot: Slot,
|
||||||
) -> BlockstoreProcessorResult {
|
) -> BlockstoreProcessorResult {
|
||||||
do_process_blockstore_from_root(
|
do_process_blockstore_from_root(
|
||||||
|
@ -638,7 +636,6 @@ pub(crate) fn process_blockstore_from_root(
|
||||||
cache_block_meta_sender,
|
cache_block_meta_sender,
|
||||||
snapshot_config,
|
snapshot_config,
|
||||||
accounts_package_sender,
|
accounts_package_sender,
|
||||||
timings,
|
|
||||||
Some(last_full_snapshot_slot),
|
Some(last_full_snapshot_slot),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -653,7 +650,6 @@ fn do_process_blockstore_from_root(
|
||||||
cache_block_meta_sender: Option<&CacheBlockMetaSender>,
|
cache_block_meta_sender: Option<&CacheBlockMetaSender>,
|
||||||
snapshot_config: Option<&SnapshotConfig>,
|
snapshot_config: Option<&SnapshotConfig>,
|
||||||
accounts_package_sender: AccountsPackageSender,
|
accounts_package_sender: AccountsPackageSender,
|
||||||
timings: BankFromArchiveTimings,
|
|
||||||
mut last_full_snapshot_slot: Option<Slot>,
|
mut last_full_snapshot_slot: Option<Slot>,
|
||||||
) -> BlockstoreProcessorResult {
|
) -> BlockstoreProcessorResult {
|
||||||
// Starting slot must be a root, and thus has no parents
|
// Starting slot must be a root, and thus has no parents
|
||||||
|
@ -754,26 +750,6 @@ fn do_process_blockstore_from_root(
|
||||||
("slot", bank_forks.root(), i64),
|
("slot", bank_forks.root(), i64),
|
||||||
("forks", bank_forks.banks().len(), i64),
|
("forks", bank_forks.banks().len(), i64),
|
||||||
("calculate_capitalization_us", time_cap.as_us(), i64),
|
("calculate_capitalization_us", time_cap.as_us(), i64),
|
||||||
(
|
|
||||||
"full_snapshot_untar_us",
|
|
||||||
timings.full_snapshot_untar_us,
|
|
||||||
i64
|
|
||||||
),
|
|
||||||
(
|
|
||||||
"incremental_snapshot_untar_us",
|
|
||||||
timings.incremental_snapshot_untar_us,
|
|
||||||
i64
|
|
||||||
),
|
|
||||||
(
|
|
||||||
"rebuild_bank_from_snapshots_us",
|
|
||||||
timings.rebuild_bank_from_snapshots_us,
|
|
||||||
i64
|
|
||||||
),
|
|
||||||
(
|
|
||||||
"verify_snapshot_bank_us",
|
|
||||||
timings.verify_snapshot_bank_us,
|
|
||||||
i64
|
|
||||||
),
|
|
||||||
);
|
);
|
||||||
|
|
||||||
info!("ledger processing timing: {:?}", timing);
|
info!("ledger processing timing: {:?}", timing);
|
||||||
|
@ -3194,7 +3170,6 @@ pub mod tests {
|
||||||
None,
|
None,
|
||||||
None,
|
None,
|
||||||
accounts_package_sender,
|
accounts_package_sender,
|
||||||
BankFromArchiveTimings::default(),
|
|
||||||
None,
|
None,
|
||||||
)
|
)
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
@ -3304,7 +3279,6 @@ pub mod tests {
|
||||||
None,
|
None,
|
||||||
Some(&snapshot_config),
|
Some(&snapshot_config),
|
||||||
accounts_package_sender.clone(),
|
accounts_package_sender.clone(),
|
||||||
BankFromArchiveTimings::default(),
|
|
||||||
None,
|
None,
|
||||||
)
|
)
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
|
@ -847,7 +847,6 @@ pub fn bank_from_latest_snapshot_archives(
|
||||||
accounts_update_notifier: Option<AccountsUpdateNotifier>,
|
accounts_update_notifier: Option<AccountsUpdateNotifier>,
|
||||||
) -> Result<(
|
) -> Result<(
|
||||||
Bank,
|
Bank,
|
||||||
BankFromArchiveTimings,
|
|
||||||
FullSnapshotArchiveInfo,
|
FullSnapshotArchiveInfo,
|
||||||
Option<IncrementalSnapshotArchiveInfo>,
|
Option<IncrementalSnapshotArchiveInfo>,
|
||||||
)> {
|
)> {
|
||||||
|
@ -890,6 +889,30 @@ pub fn bank_from_latest_snapshot_archives(
|
||||||
accounts_update_notifier,
|
accounts_update_notifier,
|
||||||
)?;
|
)?;
|
||||||
|
|
||||||
|
datapoint_info!(
|
||||||
|
"bank_from_snapshot_archives",
|
||||||
|
(
|
||||||
|
"full_snapshot_untar_us",
|
||||||
|
timings.full_snapshot_untar_us,
|
||||||
|
i64
|
||||||
|
),
|
||||||
|
(
|
||||||
|
"incremental_snapshot_untar_us",
|
||||||
|
timings.incremental_snapshot_untar_us,
|
||||||
|
i64
|
||||||
|
),
|
||||||
|
(
|
||||||
|
"rebuild_bank_from_snapshots_us",
|
||||||
|
timings.rebuild_bank_from_snapshots_us,
|
||||||
|
i64
|
||||||
|
),
|
||||||
|
(
|
||||||
|
"verify_snapshot_bank_us",
|
||||||
|
timings.verify_snapshot_bank_us,
|
||||||
|
i64
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
verify_bank_against_expected_slot_hash(
|
verify_bank_against_expected_slot_hash(
|
||||||
&bank,
|
&bank,
|
||||||
incremental_snapshot_archive_info.as_ref().map_or(
|
incremental_snapshot_archive_info.as_ref().map_or(
|
||||||
|
@ -904,7 +927,6 @@ pub fn bank_from_latest_snapshot_archives(
|
||||||
|
|
||||||
Ok((
|
Ok((
|
||||||
bank,
|
bank,
|
||||||
timings,
|
|
||||||
full_snapshot_archive_info,
|
full_snapshot_archive_info,
|
||||||
incremental_snapshot_archive_info,
|
incremental_snapshot_archive_info,
|
||||||
))
|
))
|
||||||
|
|
Loading…
Reference in New Issue