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

Lower warn to info, fetch from validator root instead of root + 1 (#4870) (#4873)

Browse Source 
automerge
This commit is contained in:
mergify[bot]
2019-06-28 16:55:46 -07:00
committed by Grimes
parent ad9fa54a47
commit 092556ae5e
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/cluster_info_repair_listener.rs
View File

@@ -260,14 +260,16 @@ impl ClusterInfoRepairListener {
num_slots_to_repair: usize, num_slots_to_repair: usize,
epoch_schedule: &EpochSchedule, epoch_schedule: &EpochSchedule,
) -> Result<()> { ) -> Result<()> {
let slot_iter = blocktree.rooted_slot_iterator(repairee_epoch_slots.root + 1); let slot_iter = blocktree.rooted_slot_iterator(repairee_epoch_slots.root);
if slot_iter.is_err() { if slot_iter.is_err() {
warn!("Root for repairee is on different fork OR replay_stage hasn't marked this slot as root yet"); info!(
"Root for repairee is on different fork. My root: {}, repairee_root: {}",
my_root, repairee_epoch_slots.root
);
return Ok(()); return Ok(());
} }
let slot_iter = slot_iter?; let mut slot_iter = slot_iter?;
let mut total_data_blobs_sent = 0; let mut total_data_blobs_sent = 0;
let mut total_coding_blobs_sent = 0; let mut total_coding_blobs_sent = 0;
@@ -276,6 +278,10 @@ impl ClusterInfoRepairListener {
epoch_schedule.get_stakers_epoch(repairee_epoch_slots.root); epoch_schedule.get_stakers_epoch(repairee_epoch_slots.root);
let max_confirmed_repairee_slot = let max_confirmed_repairee_slot =
epoch_schedule.get_last_slot_in_epoch(max_confirmed_repairee_epoch); epoch_schedule.get_last_slot_in_epoch(max_confirmed_repairee_epoch);
// Skip the first slot in the iterator because we know it's the root slot which the repairee
// already has
slot_iter.next();
for (slot, slot_meta) in slot_iter { for (slot, slot_meta) in slot_iter {
if slot > my_root if slot > my_root
|| num_slots_repaired >= num_slots_to_repair || num_slots_repaired >= num_slots_to_repair