blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Report how many grace ticks were afforded to previous leader (#3350)

This commit is contained in:
Pankaj Garg 2019-03-18 13:24:07 -07:00 committed by GitHub
parent 61a4b998fa
commit efc39ffdde
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 70 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
core/src/poh_recorder.rs
View File

@ -75,7 +75,8 @@ impl PohRecorder {
self.poh.tick_height
}
pub fn reached_leader_tick(&self) -> bool {
// returns if leader tick has reached, and how many grace ticks were afforded
pub fn reached_leader_tick(&self) -> (bool, u64) {
self.start_leader_at_tick
.map(|target_tick| {
// Either grace period has expired,
@ -87,11 +88,23 @@ impl PohRecorder {
target_tick,
self.max_last_leader_grace_ticks
);
self.tick_height() >= target_tick
let leader_ideal_start_tick =
target_tick.saturating_sub(self.max_last_leader_grace_ticks);
if self.tick_height() >= target_tick
|| self.max_last_leader_grace_ticks
>= target_tick.saturating_sub(self.start_tick)
{
return (
true,
self.tick_height().saturating_sub(leader_ideal_start_tick),
);
}
(false, 0)
})
.unwrap_or(false)
.unwrap_or((false, 0))
}
// synchronize PoH with a bank
@ -625,7 +638,7 @@ mod tests {
PohRecorder::new(0, prev_hash, 0, None, bank.ticks_per_slot());
// Test that with no leader slot, we don't reach the leader tick
assert_eq!(poh_recorder.reached_leader_tick(), false);
assert_eq!(poh_recorder.reached_leader_tick().0, false);
for _ in 0..bank.ticks_per_slot() {
poh_recorder.tick();
@ -635,7 +648,7 @@ mod tests {
assert_eq!(poh_recorder.tick_height(), 0);
// Test that with no leader slot, we don't reach the leader tick after sending some ticks
assert_eq!(poh_recorder.reached_leader_tick(), false);
assert_eq!(poh_recorder.reached_leader_tick().0, false);
poh_recorder.reset(
poh_recorder.tick_height(),
@ -646,7 +659,7 @@ mod tests {
);
// Test that with no leader slot in reset(), we don't reach the leader tick
assert_eq!(poh_recorder.reached_leader_tick(), false);
assert_eq!(poh_recorder.reached_leader_tick().0, false);
// Provide a leader slot 1 slot down
poh_recorder.reset(
@ -671,7 +684,7 @@ mod tests {
);
// Test that we don't reach the leader tick because of grace ticks
assert_eq!(poh_recorder.reached_leader_tick(), false);
assert_eq!(poh_recorder.reached_leader_tick().0, false);
// reset poh now. it should discard the grace ticks wait
poh_recorder.reset(
@ -682,7 +695,8 @@ mod tests {
bank.ticks_per_slot(),
);
// without sending more ticks, we should be leader now
assert_eq!(poh_recorder.reached_leader_tick(), true);
assert_eq!(poh_recorder.reached_leader_tick().0, true);
assert_eq!(poh_recorder.reached_leader_tick().1, 0);
// Now test that with grace ticks we can reach leader ticks
// Set the leader slot 1 slot down
@ -700,19 +714,54 @@ mod tests {
}
// We are not the leader yet, as expected
assert_eq!(poh_recorder.reached_leader_tick(), false);
assert_eq!(poh_recorder.reached_leader_tick().0, false);
// Send 1 less tick than the grace ticks
for _ in 0..bank.ticks_per_slot() / MAX_LAST_LEADER_GRACE_TICKS_FACTOR - 1 {
poh_recorder.tick();
}
// We are still not the leader
assert_eq!(poh_recorder.reached_leader_tick(), false);
assert_eq!(poh_recorder.reached_leader_tick().0, false);
// Send one more tick
poh_recorder.tick();
// We should be the leader now
assert_eq!(poh_recorder.reached_leader_tick(), true);
assert_eq!(poh_recorder.reached_leader_tick().0, true);
assert_eq!(
poh_recorder.reached_leader_tick().1,
bank.ticks_per_slot() / MAX_LAST_LEADER_GRACE_TICKS_FACTOR
);
// Let's test that correct grace ticks are reported
// Set the leader slot 1 slot down
poh_recorder.reset(
poh_recorder.tick_height(),
bank.last_blockhash(),
3,
Some(4),
bank.ticks_per_slot(),
);
// Send remaining ticks for the slot (remember we sent extra ticks in the previous part of the test)
for _ in bank.ticks_per_slot() / MAX_LAST_LEADER_GRACE_TICKS_FACTOR..bank.ticks_per_slot() {
poh_recorder.tick();
}
// Send one extra tick before resetting (so that there's one grace tick)
poh_recorder.tick();
// We are not the leader yet, as expected
assert_eq!(poh_recorder.reached_leader_tick().0, false);
poh_recorder.reset(
poh_recorder.tick_height(),
bank.last_blockhash(),
3,
Some(4),
bank.ticks_per_slot(),
);
// without sending more ticks, we should be leader now
assert_eq!(poh_recorder.reached_leader_tick().0, true);
assert_eq!(poh_recorder.reached_leader_tick().1, 1);
}
}

20
core/src/replay_stage.rs
View File

@ -192,17 +192,11 @@ impl ReplayStage {
is_tpu_bank_active = false;
}
let mut reached_leader_tick = false;
if !is_tpu_bank_active {
let (reached_leader_tick, grace_ticks) = if !is_tpu_bank_active {
let poh = poh_recorder.lock().unwrap();
reached_leader_tick = poh.reached_leader_tick();
debug!(
"{:?} TPU bank inactive. poh tick {}, leader {}",
my_id,
poh.tick_height(),
reached_leader_tick
);
poh.reached_leader_tick()
} else {
(false, 0)
};
if !is_tpu_bank_active {
@ -220,6 +214,7 @@ impl ReplayStage {
&blocktree,
poh_slot,
reached_leader_tick,
grace_ticks,
);
}
@ -252,6 +247,7 @@ impl ReplayStage {
blocktree: &Blocktree,
poh_slot: u64,
reached_leader_tick: bool,
grace_ticks: u64,
) {
trace!("{} checking poh slot {}", my_id, poh_slot);
if blocktree.meta(poh_slot).unwrap().is_some() {
@ -279,6 +275,10 @@ impl ReplayStage {
"count",
influxdb::Value::Integer(poh_slot as i64),
)
.add_field(
"grace",
influxdb::Value::Integer(grace_ticks as i64),
)
.to_owned(),);
let tpu_bank = Bank::new_from_parent(parent, my_id, poh_slot);
bank_forks.write().unwrap().insert(poh_slot, tpu_bank);