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

Cherry pick #3572 and #3459 (#3608)

Browse Source 
* Fix skipping half leader slot

* Get rid of unnecessary frozen banks
This commit is contained in:
carllin
2019-04-02 17:57:00 -07:00
committed by GitHub
parent e4aba9c900
commit 0f9c516570
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/poh_recorder.rs
View File

@ -238,6 +238,7 @@ impl PohRecorder {
working_bank.bank.slot() working_bank.bank.slot()
); );
self.start_slot = working_bank.max_tick_height / working_bank.bank.ticks_per_slot(); self.start_slot = working_bank.max_tick_height / working_bank.bank.ticks_per_slot();
self.start_tick = (self.start_slot + 1) * working_bank.bank.ticks_per_slot();
self.clear_bank(); self.clear_bank();
} }
if e.is_err() { if e.is_err() {

14
core/src/replay_stage.rs
View File

@ -237,12 +237,16 @@ impl ReplayStage {
) { ) {
trace!("{} checking poh slot {}", my_id, poh_slot); trace!("{} checking poh slot {}", my_id, poh_slot);
if bank_forks.read().unwrap().get(poh_slot).is_none() { if bank_forks.read().unwrap().get(poh_slot).is_none() {
let frozen = bank_forks.read().unwrap().frozen_banks();
let parent_slot = poh_recorder.lock().unwrap().start_slot(); let parent_slot = poh_recorder.lock().unwrap().start_slot();
assert!(frozen.contains_key(&parent_slot)); let parent = {
let parent = &frozen[&parent_slot]; let r_bf = bank_forks.read().unwrap();
r_bf.get(parent_slot)
.expect("start slot doesn't exist in bank forks")
.clone()
};
assert!(parent.is_frozen());
leader_schedule_utils::slot_leader_at(poh_slot, parent) leader_schedule_utils::slot_leader_at(poh_slot, &parent)
.map(|next_leader| { .map(|next_leader| {
debug!( debug!(
"me: {} leader {} at poh slot {}", "me: {} leader {} at poh slot {}",
@ -262,7 +266,7 @@ impl ReplayStage {
influxdb::Value::Integer(grace_ticks as i64), influxdb::Value::Integer(grace_ticks as i64),
) )
.to_owned(),); .to_owned(),);
let tpu_bank = Bank::new_from_parent(parent, my_id, poh_slot); let tpu_bank = Bank::new_from_parent(&parent, my_id, poh_slot);
bank_forks.write().unwrap().insert(tpu_bank); bank_forks.write().unwrap().insert(tpu_bank);
if let Some(tpu_bank) = bank_forks.read().unwrap().get(poh_slot).cloned() { if let Some(tpu_bank) = bank_forks.read().unwrap().get(poh_slot).cloned() {
assert_eq!( assert_eq!(