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

Add metrics for rpc send-transaction failures (backport #18156) (#18163)

Browse Source 
* Add metrics for rpc send-tx failures (#18156)

(cherry picked from commit 64cff8c5a1)

# Conflicts:
#	core/src/rpc.rs

* Fix conflict

Co-authored-by: Tyera Eulberg <teulberg@gmail.com>
Co-authored-by: Tyera Eulberg <tyera@solana.com>
This commit is contained in:
mergify[bot]
2021-06-23 00:00:10 -06:00
committed by GitHub
parent 37f618fc62
commit 07865a97ce
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/rpc.rs
View File

@ -67,7 +67,7 @@ use solana_sdk::{
stake_history::StakeHistory, stake_history::StakeHistory,
system_instruction, system_instruction,
sysvar::stake_history, sysvar::stake_history,
transaction::{self, Transaction}, transaction::{self, Transaction, TransactionError},
}; };
use solana_stake_program::stake_state::StakeState; use solana_stake_program::stake_state::StakeState;
use solana_transaction_status::{ use solana_transaction_status::{
@ -3144,12 +3144,14 @@ pub mod rpc_full {
match meta.health.check() { match meta.health.check() {
RpcHealthStatus::Ok => (), RpcHealthStatus::Ok => (),
RpcHealthStatus::Unknown => { RpcHealthStatus::Unknown => {
inc_new_counter_info!("rpc-send-tx_health-unknown", 1);
return Err(RpcCustomError::NodeUnhealthy { return Err(RpcCustomError::NodeUnhealthy {
num_slots_behind: None, num_slots_behind: None,
} }
.into()); .into());
} }
RpcHealthStatus::Behind { num_slots } => { RpcHealthStatus::Behind { num_slots } => {
inc_new_counter_info!("rpc-send-tx_health-behind", 1);
return Err(RpcCustomError::NodeUnhealthy { return Err(RpcCustomError::NodeUnhealthy {
num_slots_behind: Some(num_slots), num_slots_behind: Some(num_slots),
} }
@ -3158,6 +3160,14 @@ pub mod rpc_full {
} }
if let (Err(err), logs, _) = preflight_bank.simulate_transaction(&transaction) { if let (Err(err), logs, _) = preflight_bank.simulate_transaction(&transaction) {
match err {
TransactionError::BlockhashNotFound => {
inc_new_counter_info!("rpc-send-tx_err-blockhash-not-found", 1);
}
_ => {
inc_new_counter_info!("rpc-send-tx_err-other", 1);
}
}
return Err(RpcCustomError::SendTransactionPreflightFailure { return Err(RpcCustomError::SendTransactionPreflightFailure {
message: format!("Transaction simulation failed: {}", err), message: format!("Transaction simulation failed: {}", err),
result: RpcSimulateTransactionResult { result: RpcSimulateTransactionResult {