blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refresh blockhash for retrials of failed get_fee calls (#29494) 

* add log for error for failed rpc calls

* refresh blockhash when retry get_fee_for_message

* clippy
This commit is contained in:
HaoranYi 2023-01-06 08:53:38 -06:00 committed by GitHub
parent 272e5a05f2
commit b3a3e03c6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
accounts-cluster-bench/src/main.rs
View File

@ -6,7 +6,7 @@ use {
rayon::prelude::*, rayon::prelude::*,
solana_account_decoder::parse_token::spl_token_pubkey, solana_account_decoder::parse_token::spl_token_pubkey,
solana_clap_utils::input_parsers::pubkey_of, solana_clap_utils::input_parsers::pubkey_of,
solana_client::{rpc_client::SerializableMessage, transaction_executor::TransactionExecutor}, solana_client::transaction_executor::TransactionExecutor,
solana_faucet::faucet::{request_airdrop_transaction, FAUCET_PORT}, solana_faucet::faucet::{request_airdrop_transaction, FAUCET_PORT},
solana_gossip::gossip_service::discover, solana_gossip::gossip_service::discover,
solana_rpc_client::rpc_client::RpcClient, solana_rpc_client::rpc_client::RpcClient,
@ -42,10 +42,15 @@ pub const MAX_RPC_CALL_RETRIES: usize = 5;
pub fn poll_get_latest_blockhash(client: &RpcClient) -> Option<Hash> { pub fn poll_get_latest_blockhash(client: &RpcClient) -> Option<Hash> {
let mut num_retries = MAX_RPC_CALL_RETRIES; let mut num_retries = MAX_RPC_CALL_RETRIES;
loop { loop {
if let Ok(blockhash) = client.get_latest_blockhash() { let response = client.get_latest_blockhash();
if let Ok(blockhash) = response {
return Some(blockhash); return Some(blockhash);
} else { } else {
num_retries -= 1; num_retries -= 1;
warn!(
"get_latest_blockhash failure: {:?}. remaining retries {}",
response, num_retries
);
} }
if num_retries == 0 { if num_retries == 0 {
panic!("failed to get_latest_blockhash(), rpc node down?") panic!("failed to get_latest_blockhash(), rpc node down?")
@ -54,16 +59,22 @@ pub fn poll_get_latest_blockhash(client: &RpcClient) -> Option<Hash> {
} }
} }
pub fn poll_get_fee_for_message( pub fn poll_get_fee_for_message(client: &RpcClient, message: &mut Message) -> (Option<u64>, Hash) {
client: &RpcClient,
message: &impl SerializableMessage,
) -> Option<u64> {
let mut num_retries = MAX_RPC_CALL_RETRIES; let mut num_retries = MAX_RPC_CALL_RETRIES;
loop { loop {
if let Ok(fee) = client.get_fee_for_message(message) { let response = client.get_fee_for_message(message);
return Some(fee);
if let Ok(fee) = response {
return (Some(fee), message.recent_blockhash);
} else { } else {
num_retries -= 1; num_retries -= 1;
warn!(
"get_fee_for_message failure: {:?}. remaining retries {}",
response, num_retries
);
let blockhash = poll_get_latest_blockhash(client).expect("blockhash");
message.recent_blockhash = blockhash;
} }
if num_retries == 0 { if num_retries == 0 {
panic!("failed to get_fee_for_message(), rpc node down?") panic!("failed to get_fee_for_message(), rpc node down?")
@ -318,7 +329,8 @@ fn run_accounts_bench(
} }
message.recent_blockhash = blockhash; message.recent_blockhash = blockhash;
let fee = poll_get_fee_for_message(&client, &message).expect("get_fee_for_message"); let (fee, blockhash) = poll_get_fee_for_message(&client, &mut message);
let fee = fee.expect("get_fee_for_message");
let lamports = min_balance + fee; let lamports = min_balance + fee;
for (i, balance) in balances.iter_mut().enumerate() { for (i, balance) in balances.iter_mut().enumerate() {
@ -443,7 +455,8 @@ fn run_accounts_bench(
latest_blockhash = Instant::now(); latest_blockhash = Instant::now();
} }
message.recent_blockhash = blockhash; message.recent_blockhash = blockhash;
let fee = poll_get_fee_for_message(&client, &message).expect("get_fee_for_message"); let (fee, blockhash) = poll_get_fee_for_message(&client, &mut message);
let fee = fee.expect("get_fee_for_message");
let sigs_len = executor.num_outstanding(); let sigs_len = executor.num_outstanding();
if sigs_len < batch_size && max_closed_seed < max_created_seed { if sigs_len < batch_size && max_closed_seed < max_created_seed {