2020-03-12 17:34:46 -07:00
|
|
|
use crate::{
|
|
|
|
cluster_info::ClusterInfo, contact_info::ContactInfo, epoch_slots::EpochSlots,
|
2021-02-08 02:07:00 +00:00
|
|
|
serve_repair::RepairType,
|
2020-03-12 17:34:46 -07:00
|
|
|
};
|
2020-06-17 09:27:03 -06:00
|
|
|
use solana_runtime::{bank_forks::BankForks, epoch_stakes::NodeIdToVoteAccounts};
|
2020-03-11 21:31:50 -07:00
|
|
|
use solana_sdk::{clock::Slot, pubkey::Pubkey};
|
|
|
|
use std::{
|
2021-02-09 22:04:41 +00:00
|
|
|
collections::{BTreeMap, HashMap, HashSet},
|
2020-03-25 18:09:19 -07:00
|
|
|
sync::{Arc, RwLock},
|
2020-03-11 21:31:50 -07:00
|
|
|
};
|
|
|
|
|
2021-02-08 02:07:00 +00:00
|
|
|
pub type SlotPubkeys = HashMap<Pubkey, u64>;
|
2020-03-25 18:09:19 -07:00
|
|
|
|
2020-03-11 21:31:50 -07:00
|
|
|
#[derive(Default)]
|
|
|
|
pub struct ClusterSlots {
|
2021-02-09 22:04:41 +00:00
|
|
|
cluster_slots: RwLock<BTreeMap<Slot, Arc<RwLock<SlotPubkeys>>>>,
|
2020-03-25 18:09:19 -07:00
|
|
|
since: RwLock<Option<u64>>,
|
|
|
|
validator_stakes: RwLock<Arc<NodeIdToVoteAccounts>>,
|
|
|
|
epoch: RwLock<Option<u64>>,
|
|
|
|
self_id: RwLock<Pubkey>,
|
2020-03-11 21:31:50 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
impl ClusterSlots {
|
2020-03-25 18:09:19 -07:00
|
|
|
pub fn lookup(&self, slot: Slot) -> Option<Arc<RwLock<SlotPubkeys>>> {
|
|
|
|
self.cluster_slots.read().unwrap().get(&slot).cloned()
|
2020-03-11 21:31:50 -07:00
|
|
|
}
|
2020-04-21 12:54:45 -07:00
|
|
|
pub fn update(&self, root: Slot, cluster_info: &ClusterInfo, bank_forks: &RwLock<BankForks>) {
|
2020-03-11 21:31:50 -07:00
|
|
|
self.update_peers(cluster_info, bank_forks);
|
2020-03-25 18:09:19 -07:00
|
|
|
let since = *self.since.read().unwrap();
|
2021-02-09 22:04:41 +00:00
|
|
|
let (epoch_slots, since) = cluster_info.get_epoch_slots_since(since);
|
|
|
|
self.update_internal(root, epoch_slots, since);
|
2020-03-11 21:31:50 -07:00
|
|
|
}
|
2021-02-09 22:04:41 +00:00
|
|
|
fn update_internal(&self, root: Slot, epoch_slots_list: Vec<EpochSlots>, since: Option<u64>) {
|
2020-03-11 21:31:50 -07:00
|
|
|
for epoch_slots in epoch_slots_list {
|
|
|
|
let slots = epoch_slots.to_slots(root);
|
|
|
|
for slot in &slots {
|
|
|
|
if *slot <= root {
|
|
|
|
continue;
|
|
|
|
}
|
2021-02-08 02:07:00 +00:00
|
|
|
self.insert_node_id(*slot, epoch_slots.from);
|
2020-03-11 21:31:50 -07:00
|
|
|
}
|
|
|
|
}
|
2021-02-09 22:04:41 +00:00
|
|
|
{
|
|
|
|
let mut cluster_slots = self.cluster_slots.write().unwrap();
|
|
|
|
*cluster_slots = cluster_slots.split_off(&(root + 1));
|
|
|
|
}
|
2020-03-25 18:09:19 -07:00
|
|
|
*self.since.write().unwrap() = since;
|
2020-03-11 21:31:50 -07:00
|
|
|
}
|
2020-05-05 14:07:21 -07:00
|
|
|
|
2020-03-11 21:31:50 -07:00
|
|
|
pub fn collect(&self, id: &Pubkey) -> HashSet<Slot> {
|
|
|
|
self.cluster_slots
|
2020-03-25 18:09:19 -07:00
|
|
|
.read()
|
|
|
|
.unwrap()
|
2020-03-11 21:31:50 -07:00
|
|
|
.iter()
|
2021-02-09 22:04:41 +00:00
|
|
|
.filter(|(_, keys)| keys.read().unwrap().contains_key(id))
|
|
|
|
.map(|(slot, _)| *slot)
|
2020-03-11 21:31:50 -07:00
|
|
|
.collect()
|
|
|
|
}
|
|
|
|
|
2021-02-08 02:07:00 +00:00
|
|
|
pub fn insert_node_id(&self, slot: Slot, node_id: Pubkey) {
|
2020-05-05 14:07:21 -07:00
|
|
|
let balance = self
|
|
|
|
.validator_stakes
|
|
|
|
.read()
|
|
|
|
.unwrap()
|
|
|
|
.get(&node_id)
|
|
|
|
.map(|v| v.total_stake)
|
|
|
|
.unwrap_or(0);
|
2021-02-09 22:04:41 +00:00
|
|
|
let slot_pubkeys = self
|
|
|
|
.cluster_slots
|
2020-05-05 14:07:21 -07:00
|
|
|
.write()
|
|
|
|
.unwrap()
|
2021-02-09 22:04:41 +00:00
|
|
|
.entry(slot)
|
|
|
|
.or_default()
|
|
|
|
.clone();
|
|
|
|
slot_pubkeys.write().unwrap().insert(node_id, balance);
|
2020-05-05 14:07:21 -07:00
|
|
|
}
|
|
|
|
|
2020-04-21 12:54:45 -07:00
|
|
|
fn update_peers(&self, cluster_info: &ClusterInfo, bank_forks: &RwLock<BankForks>) {
|
2020-12-27 13:28:05 +00:00
|
|
|
let root_bank = bank_forks.read().unwrap().root_bank();
|
2020-03-25 18:09:19 -07:00
|
|
|
let root_epoch = root_bank.epoch();
|
|
|
|
let my_epoch = *self.epoch.read().unwrap();
|
|
|
|
|
|
|
|
if Some(root_epoch) != my_epoch {
|
|
|
|
let validator_stakes = root_bank
|
|
|
|
.epoch_stakes(root_epoch)
|
|
|
|
.expect(
|
|
|
|
"Bank must have epoch stakes
|
|
|
|
for its own epoch",
|
|
|
|
)
|
|
|
|
.node_id_to_vote_accounts()
|
|
|
|
.clone();
|
|
|
|
|
|
|
|
*self.validator_stakes.write().unwrap() = validator_stakes;
|
2020-04-21 12:54:45 -07:00
|
|
|
let id = cluster_info.id();
|
2020-03-25 18:09:19 -07:00
|
|
|
*self.self_id.write().unwrap() = id;
|
|
|
|
*self.epoch.write().unwrap() = Some(root_epoch);
|
2020-03-11 21:31:50 -07:00
|
|
|
}
|
|
|
|
}
|
2020-03-12 17:34:46 -07:00
|
|
|
|
2020-12-03 14:26:07 +00:00
|
|
|
pub fn compute_weights(&self, slot: Slot, repair_peers: &[ContactInfo]) -> Vec<u64> {
|
|
|
|
let stakes = {
|
|
|
|
let validator_stakes = self.validator_stakes.read().unwrap();
|
|
|
|
repair_peers
|
|
|
|
.iter()
|
|
|
|
.map(|peer| {
|
|
|
|
validator_stakes
|
|
|
|
.get(&peer.id)
|
|
|
|
.map(|node| node.total_stake)
|
|
|
|
.unwrap_or(0)
|
|
|
|
+ 1
|
|
|
|
})
|
|
|
|
.collect()
|
|
|
|
};
|
|
|
|
let slot_peers = match self.lookup(slot) {
|
|
|
|
None => return stakes,
|
|
|
|
Some(slot_peers) => slot_peers,
|
|
|
|
};
|
|
|
|
let slot_peers = slot_peers.read().unwrap();
|
2020-03-12 17:34:46 -07:00
|
|
|
repair_peers
|
|
|
|
.iter()
|
2020-12-03 14:26:07 +00:00
|
|
|
.map(|peer| slot_peers.get(&peer.id).cloned().unwrap_or(0))
|
|
|
|
.zip(stakes)
|
|
|
|
.map(|(a, b)| a + b)
|
2020-03-12 17:34:46 -07:00
|
|
|
.collect()
|
2020-03-11 21:31:50 -07:00
|
|
|
}
|
|
|
|
|
2020-05-05 14:07:21 -07:00
|
|
|
pub fn compute_weights_exclude_noncomplete(
|
|
|
|
&self,
|
|
|
|
slot: Slot,
|
|
|
|
repair_peers: &[ContactInfo],
|
|
|
|
) -> Vec<(u64, usize)> {
|
|
|
|
let slot_peers = self.lookup(slot);
|
|
|
|
repair_peers
|
|
|
|
.iter()
|
|
|
|
.enumerate()
|
|
|
|
.filter_map(|(i, x)| {
|
|
|
|
slot_peers
|
|
|
|
.as_ref()
|
|
|
|
.and_then(|v| v.read().unwrap().get(&x.id).map(|stake| (*stake + 1, i)))
|
|
|
|
})
|
|
|
|
.collect()
|
|
|
|
}
|
|
|
|
|
2020-03-11 21:31:50 -07:00
|
|
|
pub fn generate_repairs_for_missing_slots(
|
|
|
|
&self,
|
|
|
|
self_id: &Pubkey,
|
|
|
|
root: Slot,
|
|
|
|
) -> Vec<RepairType> {
|
|
|
|
let my_slots = self.collect(self_id);
|
|
|
|
self.cluster_slots
|
2020-03-25 18:09:19 -07:00
|
|
|
.read()
|
|
|
|
.unwrap()
|
2020-03-11 21:31:50 -07:00
|
|
|
.keys()
|
|
|
|
.filter(|x| **x > root)
|
|
|
|
.filter(|x| !my_slots.contains(*x))
|
|
|
|
.map(|x| RepairType::HighestShred(*x, 0))
|
|
|
|
.collect()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
|
|
|
use super::*;
|
2020-03-25 18:09:19 -07:00
|
|
|
use solana_runtime::epoch_stakes::NodeVoteAccounts;
|
2020-03-11 21:31:50 -07:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_default() {
|
|
|
|
let cs = ClusterSlots::default();
|
2020-03-25 18:09:19 -07:00
|
|
|
assert!(cs.cluster_slots.read().unwrap().is_empty());
|
|
|
|
assert!(cs.since.read().unwrap().is_none());
|
2020-03-11 21:31:50 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_update_noop() {
|
2020-03-25 18:09:19 -07:00
|
|
|
let cs = ClusterSlots::default();
|
2021-02-09 22:04:41 +00:00
|
|
|
cs.update_internal(0, vec![], None);
|
2020-03-25 18:09:19 -07:00
|
|
|
assert!(cs.cluster_slots.read().unwrap().is_empty());
|
|
|
|
assert!(cs.since.read().unwrap().is_none());
|
2020-03-11 21:31:50 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_update_empty() {
|
2020-03-25 18:09:19 -07:00
|
|
|
let cs = ClusterSlots::default();
|
2020-03-11 21:31:50 -07:00
|
|
|
let epoch_slot = EpochSlots::default();
|
2021-02-09 22:04:41 +00:00
|
|
|
cs.update_internal(0, vec![epoch_slot], Some(0));
|
2020-03-25 18:09:19 -07:00
|
|
|
assert_eq!(*cs.since.read().unwrap(), Some(0));
|
2020-03-11 21:31:50 -07:00
|
|
|
assert!(cs.lookup(0).is_none());
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_update_rooted() {
|
|
|
|
//root is 0, so it should clear out the slot
|
2020-03-25 18:09:19 -07:00
|
|
|
let cs = ClusterSlots::default();
|
2020-03-11 21:31:50 -07:00
|
|
|
let mut epoch_slot = EpochSlots::default();
|
|
|
|
epoch_slot.fill(&[0], 0);
|
2021-02-09 22:04:41 +00:00
|
|
|
cs.update_internal(0, vec![epoch_slot], Some(0));
|
2020-03-25 18:09:19 -07:00
|
|
|
assert_eq!(*cs.since.read().unwrap(), Some(0));
|
2020-03-11 21:31:50 -07:00
|
|
|
assert!(cs.lookup(0).is_none());
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_update_new_slot() {
|
2020-03-25 18:09:19 -07:00
|
|
|
let cs = ClusterSlots::default();
|
2020-03-11 21:31:50 -07:00
|
|
|
let mut epoch_slot = EpochSlots::default();
|
|
|
|
epoch_slot.fill(&[1], 0);
|
2021-02-09 22:04:41 +00:00
|
|
|
cs.update_internal(0, vec![epoch_slot], Some(0));
|
2020-03-25 18:09:19 -07:00
|
|
|
assert_eq!(*cs.since.read().unwrap(), Some(0));
|
2020-03-11 21:31:50 -07:00
|
|
|
assert!(cs.lookup(0).is_none());
|
|
|
|
assert!(cs.lookup(1).is_some());
|
2020-03-25 18:09:19 -07:00
|
|
|
assert_eq!(
|
|
|
|
cs.lookup(1)
|
|
|
|
.unwrap()
|
|
|
|
.read()
|
|
|
|
.unwrap()
|
|
|
|
.get(&Pubkey::default()),
|
|
|
|
Some(&0)
|
|
|
|
);
|
2020-03-11 21:31:50 -07:00
|
|
|
}
|
|
|
|
|
2020-03-12 17:34:46 -07:00
|
|
|
#[test]
|
|
|
|
fn test_compute_weights() {
|
|
|
|
let cs = ClusterSlots::default();
|
|
|
|
let ci = ContactInfo::default();
|
2020-12-03 14:26:07 +00:00
|
|
|
assert_eq!(cs.compute_weights(0, &[ci]), vec![1]);
|
2020-03-12 17:34:46 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_best_peer_2() {
|
2020-03-25 18:09:19 -07:00
|
|
|
let cs = ClusterSlots::default();
|
2020-03-12 17:34:46 -07:00
|
|
|
let mut c1 = ContactInfo::default();
|
|
|
|
let mut c2 = ContactInfo::default();
|
|
|
|
let mut map = HashMap::new();
|
2020-10-19 12:12:08 -07:00
|
|
|
let k1 = solana_sdk::pubkey::new_rand();
|
|
|
|
let k2 = solana_sdk::pubkey::new_rand();
|
2021-02-08 02:07:00 +00:00
|
|
|
map.insert(k1, std::u64::MAX / 2);
|
|
|
|
map.insert(k2, 0);
|
2020-03-25 18:09:19 -07:00
|
|
|
cs.cluster_slots
|
|
|
|
.write()
|
|
|
|
.unwrap()
|
|
|
|
.insert(0, Arc::new(RwLock::new(map)));
|
2020-03-12 17:34:46 -07:00
|
|
|
c1.id = k1;
|
|
|
|
c2.id = k2;
|
|
|
|
assert_eq!(
|
|
|
|
cs.compute_weights(0, &[c1, c2]),
|
2020-12-03 14:26:07 +00:00
|
|
|
vec![std::u64::MAX / 2 + 1, 1]
|
2020-03-12 17:34:46 -07:00
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_best_peer_3() {
|
2020-03-25 18:09:19 -07:00
|
|
|
let cs = ClusterSlots::default();
|
2020-03-12 17:34:46 -07:00
|
|
|
let mut c1 = ContactInfo::default();
|
|
|
|
let mut c2 = ContactInfo::default();
|
|
|
|
let mut map = HashMap::new();
|
2020-10-19 12:12:08 -07:00
|
|
|
let k1 = solana_sdk::pubkey::new_rand();
|
|
|
|
let k2 = solana_sdk::pubkey::new_rand();
|
2021-02-08 02:07:00 +00:00
|
|
|
map.insert(k2, 0);
|
2020-03-25 18:09:19 -07:00
|
|
|
cs.cluster_slots
|
|
|
|
.write()
|
|
|
|
.unwrap()
|
|
|
|
.insert(0, Arc::new(RwLock::new(map)));
|
2020-03-12 17:34:46 -07:00
|
|
|
//make sure default weights are used as well
|
2020-03-25 18:09:19 -07:00
|
|
|
let validator_stakes: HashMap<_, _> = vec![(
|
2021-02-08 02:07:00 +00:00
|
|
|
k1,
|
2020-03-25 18:09:19 -07:00
|
|
|
NodeVoteAccounts {
|
|
|
|
total_stake: std::u64::MAX / 2,
|
|
|
|
vote_accounts: vec![Pubkey::default()],
|
|
|
|
},
|
|
|
|
)]
|
|
|
|
.into_iter()
|
|
|
|
.collect();
|
|
|
|
*cs.validator_stakes.write().unwrap() = Arc::new(validator_stakes);
|
2020-03-12 17:34:46 -07:00
|
|
|
c1.id = k1;
|
|
|
|
c2.id = k2;
|
|
|
|
assert_eq!(
|
|
|
|
cs.compute_weights(0, &[c1, c2]),
|
2020-12-03 14:26:07 +00:00
|
|
|
vec![std::u64::MAX / 2 + 1, 1]
|
2020-03-12 17:34:46 -07:00
|
|
|
);
|
|
|
|
}
|
2020-05-05 14:07:21 -07:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_best_completed_slot_peer() {
|
|
|
|
let cs = ClusterSlots::default();
|
|
|
|
let mut contact_infos = vec![ContactInfo::default(); 2];
|
|
|
|
for ci in contact_infos.iter_mut() {
|
2020-10-19 12:12:08 -07:00
|
|
|
ci.id = solana_sdk::pubkey::new_rand();
|
2020-05-05 14:07:21 -07:00
|
|
|
}
|
|
|
|
let slot = 9;
|
|
|
|
|
|
|
|
// None of these validators have completed slot 9, so should
|
|
|
|
// return nothing
|
|
|
|
assert!(cs
|
|
|
|
.compute_weights_exclude_noncomplete(slot, &contact_infos)
|
|
|
|
.is_empty());
|
|
|
|
|
|
|
|
// Give second validator max stake
|
|
|
|
let validator_stakes: HashMap<_, _> = vec![(
|
|
|
|
*Arc::new(contact_infos[1].id),
|
|
|
|
NodeVoteAccounts {
|
|
|
|
total_stake: std::u64::MAX / 2,
|
|
|
|
vote_accounts: vec![Pubkey::default()],
|
|
|
|
},
|
|
|
|
)]
|
|
|
|
.into_iter()
|
|
|
|
.collect();
|
|
|
|
*cs.validator_stakes.write().unwrap() = Arc::new(validator_stakes);
|
|
|
|
|
|
|
|
// Mark the first validator as completed slot 9, should pick that validator,
|
|
|
|
// even though it only has default stake, while the other validator has
|
|
|
|
// max stake
|
2021-02-08 02:07:00 +00:00
|
|
|
cs.insert_node_id(slot, contact_infos[0].id);
|
2020-05-05 14:07:21 -07:00
|
|
|
assert_eq!(
|
|
|
|
cs.compute_weights_exclude_noncomplete(slot, &contact_infos),
|
|
|
|
vec![(1, 0)]
|
|
|
|
);
|
|
|
|
}
|
2020-03-12 17:34:46 -07:00
|
|
|
|
2020-03-11 21:31:50 -07:00
|
|
|
#[test]
|
|
|
|
fn test_update_new_staked_slot() {
|
2020-03-25 18:09:19 -07:00
|
|
|
let cs = ClusterSlots::default();
|
2020-03-11 21:31:50 -07:00
|
|
|
let mut epoch_slot = EpochSlots::default();
|
|
|
|
epoch_slot.fill(&[1], 0);
|
2020-03-25 18:09:19 -07:00
|
|
|
|
|
|
|
let map = Arc::new(
|
|
|
|
vec![(
|
|
|
|
Pubkey::default(),
|
|
|
|
NodeVoteAccounts {
|
|
|
|
total_stake: 1,
|
|
|
|
vote_accounts: vec![Pubkey::default()],
|
|
|
|
},
|
|
|
|
)]
|
|
|
|
.into_iter()
|
|
|
|
.collect(),
|
|
|
|
);
|
|
|
|
|
|
|
|
*cs.validator_stakes.write().unwrap() = map;
|
2021-02-09 22:04:41 +00:00
|
|
|
cs.update_internal(0, vec![epoch_slot], None);
|
2020-03-11 21:31:50 -07:00
|
|
|
assert!(cs.lookup(1).is_some());
|
2020-03-25 18:09:19 -07:00
|
|
|
assert_eq!(
|
|
|
|
cs.lookup(1)
|
|
|
|
.unwrap()
|
|
|
|
.read()
|
|
|
|
.unwrap()
|
|
|
|
.get(&Pubkey::default()),
|
|
|
|
Some(&1)
|
|
|
|
);
|
2020-03-11 21:31:50 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_generate_repairs() {
|
2020-03-25 18:09:19 -07:00
|
|
|
let cs = ClusterSlots::default();
|
2020-03-11 21:31:50 -07:00
|
|
|
let mut epoch_slot = EpochSlots::default();
|
|
|
|
epoch_slot.fill(&[1], 0);
|
2021-02-09 22:04:41 +00:00
|
|
|
cs.update_internal(0, vec![epoch_slot], None);
|
2020-10-19 12:12:08 -07:00
|
|
|
let self_id = solana_sdk::pubkey::new_rand();
|
2020-03-11 21:31:50 -07:00
|
|
|
assert_eq!(
|
|
|
|
cs.generate_repairs_for_missing_slots(&self_id, 0),
|
|
|
|
vec![RepairType::HighestShred(1, 0)]
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_collect_my_slots() {
|
2020-03-25 18:09:19 -07:00
|
|
|
let cs = ClusterSlots::default();
|
2020-03-11 21:31:50 -07:00
|
|
|
let mut epoch_slot = EpochSlots::default();
|
|
|
|
epoch_slot.fill(&[1], 0);
|
|
|
|
let self_id = epoch_slot.from;
|
2021-02-09 22:04:41 +00:00
|
|
|
cs.update_internal(0, vec![epoch_slot], None);
|
2020-03-11 21:31:50 -07:00
|
|
|
let slots: Vec<Slot> = cs.collect(&self_id).into_iter().collect();
|
|
|
|
assert_eq!(slots, vec![1]);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_generate_repairs_existing() {
|
2020-03-25 18:09:19 -07:00
|
|
|
let cs = ClusterSlots::default();
|
2020-03-11 21:31:50 -07:00
|
|
|
let mut epoch_slot = EpochSlots::default();
|
|
|
|
epoch_slot.fill(&[1], 0);
|
|
|
|
let self_id = epoch_slot.from;
|
2021-02-09 22:04:41 +00:00
|
|
|
cs.update_internal(0, vec![epoch_slot], None);
|
2020-03-11 21:31:50 -07:00
|
|
|
assert!(cs
|
|
|
|
.generate_repairs_for_missing_slots(&self_id, 0)
|
|
|
|
.is_empty());
|
|
|
|
}
|
|
|
|
}
|