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

Skip sleeping in replay stage if a bank was recently processed (bp #5161) (#5178)

Browse Source 
automerge
This commit is contained in:
mergify[bot]
2019-07-18 15:47:14 -07:00
committed by Grimes
parent 5a99e86a60
commit 3ddc92ab86
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/replay_stage.rs
View File

@ -124,17 +124,15 @@ impl ReplayStage {
&mut bank_forks.write().unwrap(), &mut bank_forks.write().unwrap(),
&leader_schedule_cache, &leader_schedule_cache,
); );
let mut is_tpu_bank_active = poh_recorder.lock().unwrap().bank().is_some(); let mut is_tpu_bank_active = poh_recorder.lock().unwrap().bank().is_some();
let did_process_bank = Self::replay_active_banks(
Self::replay_active_banks(
&blocktree, &blocktree,
&bank_forks, &bank_forks,
&my_pubkey, &my_pubkey,
&mut ticks_per_slot, &mut ticks_per_slot,
&mut progress, &mut progress,
&slot_full_sender, &slot_full_sender,
)?; );
if ticks_per_slot == 0 { if ticks_per_slot == 0 {
let frozen_banks = bank_forks.read().unwrap().frozen_banks(); let frozen_banks = bank_forks.read().unwrap().frozen_banks();
@ -203,6 +201,10 @@ impl ReplayStage {
"replicate_stage-duration", "replicate_stage-duration",
duration_as_ms(&now.elapsed()) as usize duration_as_ms(&now.elapsed()) as usize
); );
if did_process_bank {
//just processed a bank, skip the signal; maybe there's more slots available
continue;
}
let timer = Duration::from_millis(100); let timer = Duration::from_millis(100);
let result = ledger_signal_receiver.recv_timeout(timer); let result = ledger_signal_receiver.recv_timeout(timer);
match result { match result {
@ -406,7 +408,8 @@ impl ReplayStage {
ticks_per_slot: &mut u64, ticks_per_slot: &mut u64,
progress: &mut HashMap<u64, ForkProgress>, progress: &mut HashMap<u64, ForkProgress>,
slot_full_sender: &Sender<(u64, Pubkey)>, slot_full_sender: &Sender<(u64, Pubkey)>,
) -> Result<()> { ) -> bool {
let mut did_process_bank = false;
let active_banks = bank_forks.read().unwrap().active_banks(); let active_banks = bank_forks.read().unwrap().active_banks();
trace!("active banks {:?}", active_banks); trace!("active banks {:?}", active_banks);
@ -429,11 +432,11 @@ impl ReplayStage {
} }
let max_tick_height = (*bank_slot + 1) * bank.ticks_per_slot() - 1; let max_tick_height = (*bank_slot + 1) * bank.ticks_per_slot() - 1;
if bank.tick_height() == max_tick_height { if bank.tick_height() == max_tick_height {
did_process_bank = true;
Self::process_completed_bank(my_pubkey, bank, slot_full_sender); Self::process_completed_bank(my_pubkey, bank, slot_full_sender);
} }
} }
did_process_bank
Ok(())
} }
fn generate_votable_banks( fn generate_votable_banks(