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

Add --follow option to catchup command to allow for easy ongoing monitoring between two nodes

Browse Source
This commit is contained in:
Michael Vines
2020-04-02 11:05:29 -07:00
parent 1078c86100
commit 303a1207c1
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cli/src/cli.rs
View File

@ -173,6 +173,7 @@ pub enum CliCommand {
Catchup { Catchup {
node_pubkey: Pubkey, node_pubkey: Pubkey,
node_json_rpc_url: Option<String>, node_json_rpc_url: Option<String>,
follow: bool,
}, },
ClusterVersion, ClusterVersion,
CreateAddressWithSeed { CreateAddressWithSeed {
@ -1593,7 +1594,8 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
CliCommand::Catchup { CliCommand::Catchup {
node_pubkey, node_pubkey,
node_json_rpc_url, node_json_rpc_url,
} => process_catchup(&rpc_client, node_pubkey, node_json_rpc_url), follow,
} => process_catchup(&rpc_client, node_pubkey, node_json_rpc_url, *follow),
CliCommand::ClusterVersion => process_cluster_version(&rpc_client), CliCommand::ClusterVersion => process_cluster_version(&rpc_client),
CliCommand::CreateAddressWithSeed { CliCommand::CreateAddressWithSeed {
from_pubkey, from_pubkey,

13
cli/src/cluster_query.rs
View File

@ -67,6 +67,12 @@ impl ClusterQuerySubCommands for App<'_, '_> {
.takes_value(true) .takes_value(true)
.validator(is_url) .validator(is_url)
.help("JSON RPC URL for validator, which is useful for validators with a private RPC service") .help("JSON RPC URL for validator, which is useful for validators with a private RPC service")
)
.arg(
Arg::with_name("follow")
.long("follow")
.takes_value(false)
.help("Continue reporting progress even after the validator has caught up"),
), ),
) )
.subcommand( .subcommand(
@ -269,10 +275,12 @@ pub fn parse_catchup(
) -> Result<CliCommandInfo, CliError> { ) -> Result<CliCommandInfo, CliError> {
let node_pubkey = pubkey_of_signer(matches, "node_pubkey", wallet_manager)?.unwrap(); let node_pubkey = pubkey_of_signer(matches, "node_pubkey", wallet_manager)?.unwrap();
let node_json_rpc_url = value_t!(matches, "node_json_rpc_url", String).ok(); let node_json_rpc_url = value_t!(matches, "node_json_rpc_url", String).ok();
let follow = matches.is_present("follow");
Ok(CliCommandInfo { Ok(CliCommandInfo {
command: CliCommand::Catchup { command: CliCommand::Catchup {
node_pubkey, node_pubkey,
node_json_rpc_url, node_json_rpc_url,
follow,
}, },
signers: vec![], signers: vec![],
}) })
@ -428,6 +436,7 @@ pub fn process_catchup(
rpc_client: &RpcClient, rpc_client: &RpcClient,
node_pubkey: &Pubkey, node_pubkey: &Pubkey,
node_json_rpc_url: &Option<String>, node_json_rpc_url: &Option<String>,
follow: bool,
) -> ProcessResult { ) -> ProcessResult {
let sleep_interval = 5; let sleep_interval = 5;
@ -477,7 +486,7 @@ pub fn process_catchup(
loop { loop {
let rpc_slot = rpc_client.get_slot_with_commitment(CommitmentConfig::recent())?; let rpc_slot = rpc_client.get_slot_with_commitment(CommitmentConfig::recent())?;
let node_slot = node_client.get_slot_with_commitment(CommitmentConfig::recent())?; let node_slot = node_client.get_slot_with_commitment(CommitmentConfig::recent())?;
if node_slot > std::cmp::min(previous_rpc_slot, rpc_slot) { if !follow && node_slot > std::cmp::min(previous_rpc_slot, rpc_slot) {
progress_bar.finish_and_clear(); progress_bar.finish_and_clear();
return Ok(format!( return Ok(format!(
"{} has caught up (us:{} them:{})", "{} has caught up (us:{} them:{})",
@ -491,7 +500,7 @@ pub fn process_catchup(
slot_distance, slot_distance,
node_slot, node_slot,
rpc_slot, rpc_slot,
if previous_rpc_slot == std::u64::MAX { if slot_distance == 0 || previous_rpc_slot == std::u64::MAX {
"".to_string() "".to_string()
} else { } else {
let slots_per_second = let slots_per_second =