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

rpc-sts: dedupe before initial send (#22856)

Browse Source 
(cherry picked from commit 9f1f7aff2b)

Co-authored-by: Trent Nelson <trent@solana.com>
This commit is contained in:
mergify[bot]
2022-02-01 01:54:54 +00:00
committed by GitHub
parent 6c47a98945
commit f83cb74509
1 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
send-transaction-service/src/send_transaction_service.rs
View File

@ -5,7 +5,7 @@ use {
solana_runtime::{bank::Bank, bank_forks::BankForks}, solana_runtime::{bank::Bank, bank_forks::BankForks},
solana_sdk::{hash::Hash, nonce_account, pubkey::Pubkey, signature::Signature}, solana_sdk::{hash::Hash, nonce_account, pubkey::Pubkey, signature::Signature},
std::{ std::{
collections::HashMap, collections::hash_map::{Entry, HashMap},
net::{SocketAddr, UdpSocket}, net::{SocketAddr, UdpSocket},
sync::{ sync::{
mpsc::{Receiver, RecvTimeoutError}, mpsc::{Receiver, RecvTimeoutError},
@ -144,30 +144,36 @@ impl SendTransactionService {
Err(RecvTimeoutError::Timeout) => {} Err(RecvTimeoutError::Timeout) => {}
Ok(transaction_info) => { Ok(transaction_info) => {
inc_new_counter_info!("send_transaction_service-recv-tx", 1); inc_new_counter_info!("send_transaction_service-recv-tx", 1);
let addresses = leader_info.as_ref().map(|leader_info| { let transactions_len = transactions.len();
leader_info.get_leader_tpus(config.leader_forward_count) let entry = transactions.entry(transaction_info.signature);
}); if let Entry::Vacant(_) = entry {
let addresses = addresses let addresses = leader_info.as_ref().map(|leader_info| {
.map(|address_list| { leader_info.get_leader_tpus(config.leader_forward_count)
if address_list.is_empty() { });
vec![&tpu_address] let addresses = addresses
} else { .map(|address_list| {
address_list if address_list.is_empty() {
} vec![&tpu_address]
}) } else {
.unwrap_or_else(|| vec![&tpu_address]); address_list
for address in addresses { }
Self::send_transaction( })
&send_socket, .unwrap_or_else(|| vec![&tpu_address]);
address, for address in addresses {
&transaction_info.wire_transaction, Self::send_transaction(
); &send_socket,
} address,
if transactions.len() < MAX_TRANSACTION_QUEUE_SIZE { &transaction_info.wire_transaction,
inc_new_counter_info!("send_transaction_service-insert-tx", 1); );
transactions.insert(transaction_info.signature, transaction_info); }
if transactions_len < MAX_TRANSACTION_QUEUE_SIZE {
inc_new_counter_info!("send_transaction_service-insert-tx", 1);
entry.or_insert(transaction_info);
} else {
datapoint_warn!("send_transaction_service-queue-overflow");
}
} else { } else {
datapoint_warn!("send_transaction_service-queue-overflow"); inc_new_counter_info!("send_transaction_service-recv-duplicate", 1);
} }
} }
} }