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

Log the repairee pubkey when unable to serve them (#5222) 

automerge
This commit is contained in:
Sagar Dhawan 2019-07-22 14:13:29 -07:00 committed by Grimes
parent 264a3d7dde
commit 81f4fd56c7
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/cluster_info_repair_listener.rs
View File

@ -234,6 +234,7 @@ impl ClusterInfoRepairListener {
let _ = Self::serve_repairs_to_repairee( let _ = Self::serve_repairs_to_repairee(
my_pubkey, my_pubkey,
repairee_pubkey,
my_root, my_root,
blocktree, blocktree,
&repairee_epoch_slots, &repairee_epoch_slots,
@ -249,8 +250,10 @@ impl ClusterInfoRepairListener {
Ok(()) Ok(())
} }
#[allow(clippy::too_many_arguments)]
fn serve_repairs_to_repairee( fn serve_repairs_to_repairee(
my_pubkey: &Pubkey, my_pubkey: &Pubkey,
repairee_pubkey: &Pubkey,
my_root: u64, my_root: u64,
blocktree: &Blocktree, blocktree: &Blocktree,
repairee_epoch_slots: &EpochSlots, repairee_epoch_slots: &EpochSlots,
@ -263,8 +266,8 @@ impl ClusterInfoRepairListener {
let slot_iter = blocktree.rooted_slot_iterator(repairee_epoch_slots.root); let slot_iter = blocktree.rooted_slot_iterator(repairee_epoch_slots.root);
if slot_iter.is_err() { if slot_iter.is_err() {
info!( info!(
"Root for repairee is on different fork. My root: {}, repairee_root: {}", "Root for repairee is on different fork. My root: {}, repairee_root: {} repairee_pubkey: {:?}",
my_root, repairee_epoch_slots.root my_root, repairee_epoch_slots.root, repairee_pubkey,
); );
return Ok(()); return Ok(());
} }
@ -656,6 +659,7 @@ mod tests {
for repairman_pubkey in &eligible_repairmen { for repairman_pubkey in &eligible_repairmen {
ClusterInfoRepairListener::serve_repairs_to_repairee( ClusterInfoRepairListener::serve_repairs_to_repairee(
&repairman_pubkey, &repairman_pubkey,
&mock_repairee.id,
num_slots - 1, num_slots - 1,
&blocktree, &blocktree,
&repairee_epoch_slots, &repairee_epoch_slots,
@ -725,6 +729,7 @@ mod tests {
ClusterInfoRepairListener::serve_repairs_to_repairee( ClusterInfoRepairListener::serve_repairs_to_repairee(
&my_pubkey, &my_pubkey,
&mock_repairee.id,
total_slots - 1, total_slots - 1,
&blocktree, &blocktree,
&repairee_epoch_slots, &repairee_epoch_slots,
@ -746,6 +751,7 @@ mod tests {
EpochSlots::new(mock_repairee.id, stakers_slot_offset, repairee_slots, 1); EpochSlots::new(mock_repairee.id, stakers_slot_offset, repairee_slots, 1);
ClusterInfoRepairListener::serve_repairs_to_repairee( ClusterInfoRepairListener::serve_repairs_to_repairee(
&my_pubkey, &my_pubkey,
&mock_repairee.id,
total_slots - 1, total_slots - 1,
&blocktree, &blocktree,
&repairee_epoch_slots, &repairee_epoch_slots,