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

removes unused code from cluster-slots

Browse Source
This commit is contained in:
behzad nouri
2021-08-04 10:52:31 -04:00
parent 67788ad206
commit 2fc112edcf
1 changed files with 21 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
core/src/cluster_slots.rs
View File

@ -1,20 +1,21 @@
use crate::serve_repair::ShredRepairType; use {
use itertools::Itertools; itertools::Itertools,
use solana_gossip::{ solana_gossip::{
cluster_info::ClusterInfo, contact_info::ContactInfo, crds::Cursor, epoch_slots::EpochSlots, cluster_info::ClusterInfo, contact_info::ContactInfo, crds::Cursor, epoch_slots::EpochSlots,
}; },
use solana_runtime::{bank_forks::BankForks, epoch_stakes::NodeIdToVoteAccounts}; solana_runtime::{bank_forks::BankForks, epoch_stakes::NodeIdToVoteAccounts},
use solana_sdk::{clock::Slot, pubkey::Pubkey}; solana_sdk::{clock::Slot, pubkey::Pubkey},
use std::{ std::{
collections::{BTreeMap, HashMap, HashSet}, collections::{BTreeMap, HashMap},
sync::{Arc, Mutex, RwLock}, sync::{Arc, Mutex, RwLock},
},
}; };
// Limit the size of cluster-slots map in case // Limit the size of cluster-slots map in case
// of receiving bogus epoch slots values. // of receiving bogus epoch slots values.
const CLUSTER_SLOTS_TRIM_SIZE: usize = 524_288; // 512K const CLUSTER_SLOTS_TRIM_SIZE: usize = 524_288; // 512K
pub type SlotPubkeys = HashMap<Pubkey, u64>; pub(crate) type SlotPubkeys = HashMap</*node:*/ Pubkey, /*stake:*/ u64>;
#[derive(Default)] #[derive(Default)]
pub struct ClusterSlots { pub struct ClusterSlots {
@ -25,11 +26,16 @@ pub struct ClusterSlots {
} }
impl ClusterSlots { impl ClusterSlots {
pub fn lookup(&self, slot: Slot) -> Option<Arc<RwLock<SlotPubkeys>>> { pub(crate) fn lookup(&self, slot: Slot) -> Option<Arc<RwLock<SlotPubkeys>>> {
self.cluster_slots.read().unwrap().get(&slot).cloned() self.cluster_slots.read().unwrap().get(&slot).cloned()
} }
pub fn update(&self, root: Slot, cluster_info: &ClusterInfo, bank_forks: &RwLock<BankForks>) { pub(crate) fn update(
&self,
root: Slot,
cluster_info: &ClusterInfo,
bank_forks: &RwLock<BankForks>,
) {
self.update_peers(bank_forks); self.update_peers(bank_forks);
let epoch_slots = { let epoch_slots = {
let mut cursor = self.cursor.lock().unwrap(); let mut cursor = self.cursor.lock().unwrap();
@ -89,16 +95,6 @@ impl ClusterSlots {
} }
} }
pub fn collect(&self, id: &Pubkey) -> HashSet<Slot> {
self.cluster_slots
.read()
.unwrap()
.iter()
.filter(|(_, keys)| keys.read().unwrap().contains_key(id))
.map(|(slot, _)| *slot)
.collect()
}
#[cfg(test)] #[cfg(test)]
pub(crate) fn insert_node_id(&self, slot: Slot, node_id: Pubkey) { pub(crate) fn insert_node_id(&self, slot: Slot, node_id: Pubkey) {
let balance = self let balance = self
@ -135,7 +131,7 @@ impl ClusterSlots {
} }
} }
pub fn compute_weights(&self, slot: Slot, repair_peers: &[ContactInfo]) -> Vec<u64> { pub(crate) fn compute_weights(&self, slot: Slot, repair_peers: &[ContactInfo]) -> Vec<u64> {
if repair_peers.is_empty() { if repair_peers.is_empty() {
return Vec::default(); return Vec::default();
} }
@ -165,7 +161,7 @@ impl ClusterSlots {
.collect() .collect()
} }
pub fn compute_weights_exclude_nonfrozen( pub(crate) fn compute_weights_exclude_nonfrozen(
&self, &self,
slot: Slot, slot: Slot,
repair_peers: &[ContactInfo], repair_peers: &[ContactInfo],
@ -181,21 +177,6 @@ impl ClusterSlots {
}) })
.collect() .collect()
} }
pub fn generate_repairs_for_missing_slots(
&self,
self_id: &Pubkey,
root: Slot,
) -> Vec<ShredRepairType> {
let my_slots = self.collect(self_id);
self.cluster_slots
.read()
.unwrap()
.keys()
.filter(|x| **x > root && !my_slots.contains(*x))
.map(|x| ShredRepairType::HighestShred(*x, 0))
.collect()
}
} }
#[cfg(test)] #[cfg(test)]
@ -380,40 +361,4 @@ mod tests {
Some(&1) Some(&1)
); );
} }
#[test]
fn test_generate_repairs() {
let cs = ClusterSlots::default();
let mut epoch_slot = EpochSlots::default();
epoch_slot.fill(&[1], 0);
cs.update_internal(0, vec![epoch_slot]);
let self_id = solana_sdk::pubkey::new_rand();
assert_eq!(
cs.generate_repairs_for_missing_slots(&self_id, 0),
vec![ShredRepairType::HighestShred(1, 0)]
)
}
#[test]
fn test_collect_my_slots() {
let cs = ClusterSlots::default();
let mut epoch_slot = EpochSlots::default();
epoch_slot.fill(&[1], 0);
let self_id = epoch_slot.from;
cs.update_internal(0, vec![epoch_slot]);
let slots: Vec<Slot> = cs.collect(&self_id).into_iter().collect();
assert_eq!(slots, vec![1]);
}
#[test]
fn test_generate_repairs_existing() {
let cs = ClusterSlots::default();
let mut epoch_slot = EpochSlots::default();
epoch_slot.fill(&[1], 0);
let self_id = epoch_slot.from;
cs.update_internal(0, vec![epoch_slot]);
assert!(cs
.generate_repairs_for_missing_slots(&self_id, 0)
.is_empty());
}
} }