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

Add alternative to Spy Nodes that can fully participate in Gossip (#4087)

Browse Source 
automerge
This commit is contained in:
Sagar Dhawan
2019-04-30 16:42:56 -07:00
committed by Grimes
parent af2e7ea285
commit 9add8d0afc
3 changed files with 91 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
gossip/src/main.rs
View File

@ -1,11 +1,15 @@
//! A command-line executable for monitoring a cluster's gossip plane.
#[macro_use]
extern crate solana;
use clap::{crate_description, crate_name, crate_version, App, AppSettings, Arg, SubCommand};
use solana::contact_info::ContactInfo;
use solana::gossip_service::discover;
use solana_client::rpc_client::RpcClient;
use solana_sdk::pubkey::Pubkey;
use std::error;
use std::net::Ipv4Addr;
use std::net::SocketAddr;
use std::process::exit;
@ -38,6 +42,18 @@ fn main() -> Result<(), Box<dyn error::Error>> {
SubCommand::with_name("spy")
.about("Monitor the gossip network")
.setting(AppSettings::DisableVersion)
.arg(
clap::Arg::with_name("public_address")
.long("public-address")
.takes_value(false)
.help("Advertise public machine address in gossip. By default the local machine address is advertised"),
)
.arg(
clap::Arg::with_name("pull_only")
.long("pull-only")
.takes_value(false)
.help("Use a partial gossip node (Pulls only) to spy on the network. By default it will use a full fledged gossip node(Pushes and Pulls). Useful when behind a NAT"),
)
.arg(
Arg::with_name("num_nodes")
.short("N")
@ -111,7 +127,25 @@ fn main() -> Result<(), Box<dyn error::Error>> {
.value_of("node_pubkey")
.map(|pubkey_str| pubkey_str.parse::<Pubkey>().unwrap());
let nodes = discover(&network_addr, num_nodes, timeout, pubkey)?;
let gossip_addr = if matches.is_present("pull_only") {
None
} else {
let mut addr = socketaddr_any!();
if matches.is_present("public_address") {
addr.set_ip(solana_netutil::get_public_ip_addr().unwrap());
} else {
addr.set_ip(solana_netutil::get_ip_addr(false).unwrap());
}
Some(addr)
};
let nodes = discover(
&network_addr,
num_nodes,
timeout,
pubkey,
gossip_addr.as_ref(),
)?;
if timeout.is_some() {
if let Some(num) = num_nodes {
@ -146,7 +180,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {
.unwrap()
.parse::<Pubkey>()
.unwrap();
let nodes = discover(&network_addr, None, None, Some(pubkey))?;
let nodes = discover(&network_addr, None, None, Some(pubkey), None)?;
let node = nodes.iter().find(|x| x.id == pubkey).unwrap();
if !ContactInfo::is_valid_address(&node.rpc) {