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

Avoid assigning the serve repair port to the storage port

Browse Source
This commit is contained in:
Michael Vines
2020-02-12 10:47:54 -07:00
parent 2542d5dd42
commit d0a4686990
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/cluster_info.rs
View File

@ -261,7 +261,7 @@ impl ClusterInfo {
let ip_addr = node.gossip.ip(); let ip_addr = node.gossip.ip();
format!( format!(
"{:15} {:2}| {:5} | {:44} | {:5}| {:5}| {:5} | {:5}| {:5} | {:5}| {:5} | {:5}| {:5}| {}\n", "{:15} {:2}| {:5} | {:44} | {:5}| {:5}| {:5}| {:5}| {:5}| {:5}| {:5}| {:5}| {:5}| {:5}| {}\n",
if ContactInfo::is_valid_address(&node.gossip) { if ContactInfo::is_valid_address(&node.gossip) {
ip_addr.to_string() ip_addr.to_string()
} else { } else {
@ -276,6 +276,7 @@ impl ClusterInfo {
addr_to_string(&ip_addr, &node.tvu), addr_to_string(&ip_addr, &node.tvu),
addr_to_string(&ip_addr, &node.tvu_forwards), addr_to_string(&ip_addr, &node.tvu_forwards),
addr_to_string(&ip_addr, &node.repair), addr_to_string(&ip_addr, &node.repair),
addr_to_string(&ip_addr, &node.serve_repair),
addr_to_string(&ip_addr, &node.storage_addr), addr_to_string(&ip_addr, &node.storage_addr),
addr_to_string(&ip_addr, &node.rpc), addr_to_string(&ip_addr, &node.rpc),
addr_to_string(&ip_addr, &node.rpc_pubsub), addr_to_string(&ip_addr, &node.rpc_pubsub),
@ -286,9 +287,9 @@ impl ClusterInfo {
format!( format!(
"IP Address |Age(ms)| Node identifier \ "IP Address |Age(ms)| Node identifier \
|Gossip| TPU |TPU fwd| TVU |TVU fwd|Repair|Storage| RPC |PubSub|ShredVer\n\ |Gossip| TPU |TPUfwd| TVU |TVUfwd|Repair|ServeR|Storag| RPC |PubSub|ShredVer\n\
------------------+-------+----------------------------------------------+\ ------------------+-------+----------------------------------------------+\
------+------+-------+------+-------+------+-------+------+------+--------\n\ ------+------+------+------+------+------+------+------+------+------+--------\n\
{}\ {}\
Nodes: {}{}{}", Nodes: {}{}{}",
nodes.join(""), nodes.join(""),
@ -525,7 +526,7 @@ impl ClusterInfo {
.filter(|x| { .filter(|x| {
x.id != me.id x.id != me.id
&& x.shred_version == me.shred_version && x.shred_version == me.shred_version
&& ContactInfo::is_valid_address(&x.gossip) && ContactInfo::is_valid_address(&x.serve_repair)
&& { && {
self.get_epoch_state_for_node(&x.id, None) self.get_epoch_state_for_node(&x.id, None)
.map(|(epoch_slots, _)| epoch_slots.lowest <= slot) .map(|(epoch_slots, _)| epoch_slots.lowest <= slot)
@ -1671,10 +1672,10 @@ impl Node {
SocketAddr::new(gossip_addr.ip(), repair_port), SocketAddr::new(gossip_addr.ip(), repair_port),
SocketAddr::new(gossip_addr.ip(), tpu_port), SocketAddr::new(gossip_addr.ip(), tpu_port),
SocketAddr::new(gossip_addr.ip(), tpu_forwards_port), SocketAddr::new(gossip_addr.ip(), tpu_forwards_port),
socketaddr_any!(),
socketaddr_any!(),
socketaddr_any!(),
SocketAddr::new(gossip_addr.ip(), serve_repair_port), SocketAddr::new(gossip_addr.ip(), serve_repair_port),
socketaddr_any!(),
socketaddr_any!(),
socketaddr_any!(),
0, 0,
); );
trace!("new ContactInfo: {:?}", info); trace!("new ContactInfo: {:?}", info);