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

Add newly completed slots signal to Blocktree (#4225)

Browse Source 
* Add channel to blocktree for communicating when slots are completed

* Refactor RepairService options into a RepairStrategy
This commit is contained in:
carllin
2019-05-09 14:10:04 -07:00
committed by GitHub
parent a031b09190
commit 575a0e318b
8 changed files with 289 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
core/src/repair_service.rs
View File

@ -2,7 +2,7 @@
//! regularly finds missing blobs in the ledger and sends repair requests for those blobs
use crate::bank_forks::BankForks;
use crate::blocktree::{Blocktree, SlotMeta};
use crate::blocktree::{Blocktree, CompletedSlotsReceiver, SlotMeta};
use crate::cluster_info::ClusterInfo;
use crate::result::Result;
use crate::service::Service;
@ -22,6 +22,14 @@ pub const MAX_REPAIR_TRIES: u64 = 128;
pub const NUM_FORKS_TO_REPAIR: usize = 5;
pub const MAX_ORPHANS: usize = 5;
pub enum RepairStrategy {
RepairRange(RepairSlotRange),
RepairAll {
bank_forks: Arc<RwLock<BankForks>>,
completed_slots_receiver: CompletedSlotsReceiver,
},
}
#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq)]
pub enum RepairType {
Orphan(u64),
@ -68,8 +76,7 @@ impl RepairService {
exit: &Arc<AtomicBool>,
repair_socket: Arc<UdpSocket>,
cluster_info: Arc<RwLock<ClusterInfo>>,
bank_forks: Option<Arc<RwLock<BankForks>>>,
repair_slot_range: Option<RepairSlotRange>,
repair_strategy: RepairStrategy,
) -> Self {
let exit = exit.clone();
let t_repair = Builder::new()
@ -80,8 +87,7 @@ impl RepairService {
exit,
&repair_socket,
&cluster_info,
&bank_forks,
repair_slot_range,
repair_strategy,
)
})
.unwrap();
@ -94,8 +100,7 @@ impl RepairService {
exit: Arc<AtomicBool>,
repair_socket: &Arc<UdpSocket>,
cluster_info: &Arc<RwLock<ClusterInfo>>,
bank_forks: &Option<Arc<RwLock<BankForks>>>,
repair_slot_range: Option<RepairSlotRange>,
repair_strategy: RepairStrategy,
) {
let mut repair_info = RepairInfo::new();
let epoch_slots: HashSet<u64> = HashSet::new();
@ -106,20 +111,30 @@ impl RepairService {
}
let repairs = {
if let Some(ref repair_slot_range) = repair_slot_range {
// Strategy used by replicators
Self::generate_repairs_in_range(
blocktree,
MAX_REPAIR_LENGTH,
&mut repair_info,
repair_slot_range,
)
} else {
let bank_forks = bank_forks
.as_ref()
.expect("Non-replicator repair strategy missing BankForks");
Self::update_fast_repair(id, &epoch_slots, &cluster_info, bank_forks);
Self::generate_repairs(blocktree, MAX_REPAIR_LENGTH)
match repair_strategy {
RepairStrategy::RepairRange(ref repair_slot_range) => {
// Strategy used by replicators
Self::generate_repairs_in_range(
blocktree,
MAX_REPAIR_LENGTH,
&mut repair_info,
repair_slot_range,
)
}
RepairStrategy::RepairAll {
ref bank_forks,
ref completed_slots_receiver,
} => {
Self::update_epoch_slots(
id,
&epoch_slots,
&cluster_info,
bank_forks,
completed_slots_receiver,
);
Self::generate_repairs(blocktree, MAX_REPAIR_LENGTH)
}
}
};
@ -278,11 +293,14 @@ impl RepairService {
}
}
fn update_fast_repair(
// Update the gossiped structure used for the "Repairmen" repair protocol. See book
// for details.
fn update_epoch_slots(
id: Pubkey,
slots: &HashSet<u64>,
cluster_info: &RwLock<ClusterInfo>,
bank_forks: &Arc<RwLock<BankForks>>,
_completed_slots_receiver: &CompletedSlotsReceiver,
) {
let root = bank_forks.read().unwrap().root();
cluster_info