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

Remove support to monitor all validators in a cluster for delinquency

Browse Source 
This feature is no longer useful with hundreds of validators
This commit is contained in:
Michael Vines
2020-11-28 17:12:56 -08:00
parent ec167aead9
commit f936ce02f8
1 changed files with 46 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
watchtower/src/main.rs
View File

@ -91,7 +91,7 @@ fn get_config() -> Config {
.takes_value(true) .takes_value(true)
.validator(is_pubkey_or_keypair) .validator(is_pubkey_or_keypair)
.multiple(true) .multiple(true)
.help("Monitor a specific validator only instead of the entire cluster"), .help("Validator identities to monitor for delinquency")
) )
.arg( .arg(
Arg::with_name("no_duplicate_notifications") Arg::with_name("no_duplicate_notifications")
@ -135,12 +135,10 @@ fn get_config() -> Config {
}; };
info!("RPC URL: {}", config.json_rpc_url); info!("RPC URL: {}", config.json_rpc_url);
if !config.validator_identity_pubkeys.is_empty() {
info!( info!(
"Monitored validators: {:?}", "Monitored validators: {:?}",
config.validator_identity_pubkeys config.validator_identity_pubkeys
); );
}
config config
} }
@ -152,11 +150,11 @@ fn get_cluster_info(rpc_client: &RpcClient) -> ClientResult<(u64, Hash, RpcVoteA
} }
fn main() -> Result<(), Box<dyn error::Error>> { fn main() -> Result<(), Box<dyn error::Error>> {
let config = get_config();
solana_logger::setup_with_default("solana=info"); solana_logger::setup_with_default("solana=info");
solana_metrics::set_panic_hook("watchtower"); solana_metrics::set_panic_hook("watchtower");
let config = get_config();
let rpc_client = RpcClient::new(config.json_rpc_url.clone()); let rpc_client = RpcClient::new(config.json_rpc_url.clone());
let notifier = Notifier::default(); let notifier = Notifier::default();
let mut last_transaction_count = 0; let mut last_transaction_count = 0;
@ -226,14 +224,6 @@ fn main() -> Result<(), Box<dyn error::Error>> {
)); ));
} }
if config.validator_identity_pubkeys.is_empty() {
if !vote_accounts.delinquent.is_empty() {
failures.push((
"delinquent",
format!("{} delinquent validators", vote_accounts.delinquent.len()),
));
}
} else {
let mut errors = vec![]; let mut errors = vec![];
for validator_identity in config.validator_identity_pubkeys.iter() { for validator_identity in config.validator_identity_pubkeys.iter() {
let formatted_validator_identity = let formatted_validator_identity =
@ -261,10 +251,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {
// find some more SOL // find some more SOL
failures.push(( failures.push((
"balance", "balance",
format!( format!("{} has {} SOL", formatted_validator_identity, balance),
"{} has {} SOL",
formatted_validator_identity, balance
),
)); ));
} }
}) })
@ -279,7 +266,6 @@ fn main() -> Result<(), Box<dyn error::Error>> {
if !errors.is_empty() { if !errors.is_empty() {
failures.push(("delinquent", errors.join(","))); failures.push(("delinquent", errors.join(",")));
} }
}
for failure in failures.iter() { for failure in failures.iter() {
error!("{} sanity failure: {}", failure.0, failure.1); error!("{} sanity failure: {}", failure.0, failure.1);