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

cluster-info: Don't subtract non-shred spies from node count

Browse Source
This commit is contained in:
Trent Nelson
2021-04-05 16:15:16 -06:00
committed by mergify[bot]
parent a4f0d8636a
commit b6b08706b9
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/cluster_info.rs
View File

@ -907,7 +907,8 @@ impl ClusterInfo {
pub fn contact_info_trace(&self) -> String { pub fn contact_info_trace(&self) -> String {
let now = timestamp(); let now = timestamp();
let mut spy_nodes = 0; let mut shred_spy_nodes = 0;
let mut total_spy_nodes = 0;
let mut different_shred_nodes = 0; let mut different_shred_nodes = 0;
let my_pubkey = self.id(); let my_pubkey = self.id();
let my_shred_version = self.my_shred_version(); let my_shred_version = self.my_shred_version();
@ -915,8 +916,9 @@ impl ClusterInfo {
.all_peers() .all_peers()
.into_iter() .into_iter()
.filter_map(|(node, last_updated)| { .filter_map(|(node, last_updated)| {
if Self::is_spy_node(&node) { let is_spy_node = Self::is_spy_node(&node);
spy_nodes += 1; if is_spy_node {
total_spy_nodes += 1;
} }
let node_version = self.get_node_version(&node.id); let node_version = self.get_node_version(&node.id);
@ -924,6 +926,9 @@ impl ClusterInfo {
different_shred_nodes += 1; different_shred_nodes += 1;
None None
} else { } else {
if is_spy_node {
shred_spy_nodes += 1;
}
fn addr_to_string(default_ip: &IpAddr, addr: &SocketAddr) -> String { fn addr_to_string(default_ip: &IpAddr, addr: &SocketAddr) -> String {
if ContactInfo::is_valid_address(addr) { if ContactInfo::is_valid_address(addr) {
if &addr.ip() == default_ip { if &addr.ip() == default_ip {
@ -972,9 +977,9 @@ impl ClusterInfo {
{}\ {}\
Nodes: {}{}{}", Nodes: {}{}{}",
nodes.join(""), nodes.join(""),
nodes.len() - spy_nodes, nodes.len() - shred_spy_nodes,
if spy_nodes > 0 { if total_spy_nodes > 0 {
format!("\nSpies: {}", spy_nodes) format!("\nSpies: {}", total_spy_nodes)
} else { } else {
"".to_string() "".to_string()
}, },