gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid holding the entire rooted path while loading bank forks (#9885)

Browse Source
This commit is contained in:
Michael Vines
2020-05-05 19:45:41 -07:00
committed by GitHub
parent 3442f36f8a
commit 72312ad615
5 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ledger/src/bank_forks.rs
View File

@@ -141,7 +141,7 @@ impl BankForks {
self.banks.get(&self.root()).expect("Root bank must exist")
}
pub fn new_from_banks(initial_forks: &[Arc<Bank>], rooted_path: Vec<Slot>) -> Self {
pub fn new_from_banks(initial_forks: &[Arc<Bank>], root: Slot) -> Self {
let mut banks = HashMap::new();
let working_bank = initial_forks[0].clone();
@@ -157,7 +157,7 @@ impl BankForks {
banks.insert(parent.slot(), parent.clone());
}
}
let root = *rooted_path.last().unwrap();
Self {
root,
banks,

15
ledger/src/blockstore_processor.rs
View File

@@ -318,7 +318,7 @@ pub fn process_blockstore_from_root(
assert!(bank.parent().is_none());
let start_slot = bank.slot();
let now = Instant::now();
let mut rooted_path = vec![start_slot];
let mut root = start_slot;
bank.set_entered_epoch_callback(solana_genesis_programs::get_entered_epoch_callback(
genesis_config.operating_mode,
@@ -366,7 +366,7 @@ pub fn process_blockstore_from_root(
&meta,
blockstore,
&mut leader_schedule_cache,
&mut rooted_path,
&mut root,
opts,
recyclers,
)?;
@@ -375,7 +375,7 @@ pub fn process_blockstore_from_root(
if banks.is_empty() {
return Err(BlockstoreProcessorError::NoValidForksFound);
}
let bank_forks = BankForks::new_from_banks(&banks, rooted_path);
let bank_forks = BankForks::new_from_banks(&banks, root);
(bank_forks, bank_forks_info, leader_schedule_cache)
} else {
// If there's no meta for the input `start_slot`, then we started from a snapshot
@@ -385,7 +385,7 @@ pub fn process_blockstore_from_root(
bank_slot: start_slot,
};
let leader_schedule_cache = LeaderScheduleCache::new_from_bank(&bank);
let bank_forks = BankForks::new_from_banks(&[bank], rooted_path);
let bank_forks = BankForks::new_from_banks(&[bank], root);
(bank_forks, vec![bfi], leader_schedule_cache)
}
};
@@ -704,7 +704,7 @@ fn process_pending_slots(
root_meta: &SlotMeta,
blockstore: &Blockstore,
leader_schedule_cache: &mut LeaderScheduleCache,
rooted_path: &mut Vec<u64>,
root: &mut Slot,
opts: &ProcessOptions,
recyclers: &VerifyRecyclers,
) -> result::Result<HashMap<u64, (Arc<Bank>, BankForksInfo)>, BlockstoreProcessorError> {
@@ -752,10 +752,7 @@ fn process_pending_slots(
txs += progress.num_txs;
if blockstore.is_root(slot) {
let parents = bank.parents().into_iter().map(|b| b.slot()).rev().skip(1);
let parents: Vec<_> = parents.collect();
rooted_path.extend(parents);
rooted_path.push(slot);
*root = slot;
leader_schedule_cache.set_root(&bank);
bank.squash();
pending_slots.clear();