rpc-sts: dedupe before initial send

This commit is contained in:
Trent Nelson 2022-01-30 12:27:42 -07:00 committed by Trent Nelson
parent 29bf1e2529
commit 9f1f7aff2b
1 changed files with 30 additions and 24 deletions

View File

@ -6,7 +6,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::{Arc, RwLock}, sync::{Arc, RwLock},
thread::{self, Builder, JoinHandle}, thread::{self, Builder, JoinHandle},
@ -142,6 +142,9 @@ 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 transactions_len = transactions.len();
let entry = transactions.entry(transaction_info.signature);
if let Entry::Vacant(_) = entry {
let addresses = leader_info.as_ref().map(|leader_info| { let addresses = leader_info.as_ref().map(|leader_info| {
leader_info.get_leader_tpus(config.leader_forward_count) leader_info.get_leader_tpus(config.leader_forward_count)
}); });
@ -161,12 +164,15 @@ impl SendTransactionService {
&transaction_info.wire_transaction, &transaction_info.wire_transaction,
); );
} }
if transactions.len() < MAX_TRANSACTION_QUEUE_SIZE { if transactions_len < MAX_TRANSACTION_QUEUE_SIZE {
inc_new_counter_info!("send_transaction_service-insert-tx", 1); inc_new_counter_info!("send_transaction_service-insert-tx", 1);
transactions.insert(transaction_info.signature, transaction_info); entry.or_insert(transaction_info);
} else { } else {
datapoint_warn!("send_transaction_service-queue-overflow"); datapoint_warn!("send_transaction_service-queue-overflow");
} }
} else {
inc_new_counter_info!("send_transaction_service-recv-duplicate", 1);
}
} }
} }