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

Delete cluster_info::get_gossip_top_leader()

Browse Source
This commit is contained in:
Michael Vines
2019-03-08 11:16:13 -08:00
parent 8f0aa956a3
commit 5b386ec30a
4 changed files with 6 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
core/src/cluster_info.rs
View File

@@ -222,17 +222,11 @@ impl ClusterInfo {
}
pub fn node_info_trace(&self) -> String {
let leader_id = self.leader_id();
let gossip_top_leader = self.get_gossip_top_leader();
let nodes: Vec<_> = self
.rpc_peers()
.into_iter()
.map(|node| {
let mut annotation = String::new();
if let Some(top_leader) = gossip_top_leader {
if node.id == top_leader.id {
annotation.push_str(" [gossip top leader]");
}
}
if node.id == leader_id {
annotation.push_str(" [leader]");
}
@@ -837,36 +831,6 @@ impl ClusterInfo {
Ok(())
}
pub fn get_gossip_top_leader(&self) -> Option<&NodeInfo> {
let mut table = HashMap::new();
let def = Pubkey::default();
let cur = self
.gossip
.crds
.table
.values()
.filter_map(|x| x.value.leader_id())
.filter(|x| x.leader_id != def);
for v in cur {
let cnt = table.entry(&v.leader_id).or_insert(0);
*cnt += 1;
trace!("leader {} {}", v.leader_id, *cnt);
}
let mut sorted: Vec<(&Pubkey, usize)> = table.into_iter().collect();
for x in &sorted {
trace!("{}: sorted leaders {} votes: {}", self.gossip.id, x.0, x.1);
}
sorted.sort_by_key(|a| a.1);
let top_leader = sorted.last().map(|a| *a.0);
top_leader
.and_then(|x| {
let leader_label = CrdsValueLabel::ContactInfo(x);
self.gossip.crds.lookup(&leader_label)
})
.and_then(|x| x.contact_info())
}
/// randomly pick a node and ask them for updates asynchronously
pub fn gossip(
obj: Arc<RwLock<Self>>,