parent
f3aa80d3f8
commit
474080608a
|
@ -4669,6 +4669,7 @@ dependencies = [
|
||||||
"solana-faucet",
|
"solana-faucet",
|
||||||
"solana-logger 1.11.0",
|
"solana-logger 1.11.0",
|
||||||
"solana-measure",
|
"solana-measure",
|
||||||
|
"solana-metrics",
|
||||||
"solana-net-utils",
|
"solana-net-utils",
|
||||||
"solana-sdk",
|
"solana-sdk",
|
||||||
"solana-streamer",
|
"solana-streamer",
|
||||||
|
|
|
@ -40,6 +40,7 @@ solana-account-decoder = { path = "../account-decoder", version = "=1.11.0" }
|
||||||
solana-clap-utils = { path = "../clap-utils", version = "=1.11.0" }
|
solana-clap-utils = { path = "../clap-utils", version = "=1.11.0" }
|
||||||
solana-faucet = { path = "../faucet", version = "=1.11.0" }
|
solana-faucet = { path = "../faucet", version = "=1.11.0" }
|
||||||
solana-measure = { path = "../measure", version = "=1.11.0" }
|
solana-measure = { path = "../measure", version = "=1.11.0" }
|
||||||
|
solana-metrics = { path = "../metrics", version = "=1.11.0" }
|
||||||
solana-net-utils = { path = "../net-utils", version = "=1.11.0" }
|
solana-net-utils = { path = "../net-utils", version = "=1.11.0" }
|
||||||
solana-sdk = { path = "../sdk", version = "=1.11.0" }
|
solana-sdk = { path = "../sdk", version = "=1.11.0" }
|
||||||
solana-streamer = { path = "../streamer", version = "=1.11.0" }
|
solana-streamer = { path = "../streamer", version = "=1.11.0" }
|
||||||
|
|
|
@ -93,6 +93,17 @@ pub fn send_wire_transaction_batch(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn send_wire_transaction_async(
|
||||||
|
packets: Vec<u8>,
|
||||||
|
addr: &SocketAddr,
|
||||||
|
) -> Result<(), TransportError> {
|
||||||
|
let conn = get_connection(addr);
|
||||||
|
match conn {
|
||||||
|
Connection::Udp(conn) => conn.send_wire_transaction_async(packets),
|
||||||
|
Connection::Quic(conn) => conn.send_wire_transaction_async(packets),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub fn send_wire_transaction(
|
pub fn send_wire_transaction(
|
||||||
wire_transaction: &[u8],
|
wire_transaction: &[u8],
|
||||||
addr: &SocketAddr,
|
addr: &SocketAddr,
|
||||||
|
|
|
@ -27,6 +27,9 @@ pub mod tpu_connection;
|
||||||
pub mod transaction_executor;
|
pub mod transaction_executor;
|
||||||
pub mod udp_client;
|
pub mod udp_client;
|
||||||
|
|
||||||
|
#[macro_use]
|
||||||
|
extern crate solana_metrics;
|
||||||
|
|
||||||
pub mod mock_sender_for_cli {
|
pub mod mock_sender_for_cli {
|
||||||
/// Magic `SIGNATURE` value used by `solana-cli` unit tests.
|
/// Magic `SIGNATURE` value used by `solana-cli` unit tests.
|
||||||
/// Please don't use this constant.
|
/// Please don't use this constant.
|
||||||
|
|
|
@ -6,6 +6,8 @@ use {
|
||||||
async_mutex::Mutex,
|
async_mutex::Mutex,
|
||||||
futures::future::join_all,
|
futures::future::join_all,
|
||||||
itertools::Itertools,
|
itertools::Itertools,
|
||||||
|
lazy_static::lazy_static,
|
||||||
|
log::*,
|
||||||
quinn::{ClientConfig, Endpoint, EndpointConfig, NewConnection, WriteError},
|
quinn::{ClientConfig, Endpoint, EndpointConfig, NewConnection, WriteError},
|
||||||
solana_sdk::{
|
solana_sdk::{
|
||||||
quic::{QUIC_MAX_CONCURRENT_STREAMS, QUIC_PORT_OFFSET},
|
quic::{QUIC_MAX_CONCURRENT_STREAMS, QUIC_PORT_OFFSET},
|
||||||
|
@ -39,9 +41,14 @@ impl rustls::client::ServerCertVerifier for SkipServerVerification {
|
||||||
Ok(rustls::client::ServerCertVerified::assertion())
|
Ok(rustls::client::ServerCertVerified::assertion())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
lazy_static! {
|
||||||
|
static ref RUNTIME: Runtime = tokio::runtime::Builder::new_multi_thread()
|
||||||
|
.enable_all()
|
||||||
|
.build()
|
||||||
|
.unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
struct QuicClient {
|
struct QuicClient {
|
||||||
runtime: Runtime,
|
|
||||||
endpoint: Endpoint,
|
endpoint: Endpoint,
|
||||||
connection: Arc<Mutex<Option<Arc<NewConnection>>>>,
|
connection: Arc<Mutex<Option<Arc<NewConnection>>>>,
|
||||||
addr: SocketAddr,
|
addr: SocketAddr,
|
||||||
|
@ -67,9 +74,9 @@ impl TpuConnection for QuicTpuConnection {
|
||||||
where
|
where
|
||||||
T: AsRef<[u8]>,
|
T: AsRef<[u8]>,
|
||||||
{
|
{
|
||||||
let _guard = self.client.runtime.enter();
|
let _guard = RUNTIME.enter();
|
||||||
let send_buffer = self.client.send_buffer(wire_transaction);
|
let send_buffer = self.client.send_buffer(wire_transaction);
|
||||||
self.client.runtime.block_on(send_buffer)?;
|
RUNTIME.block_on(send_buffer)?;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -77,21 +84,33 @@ impl TpuConnection for QuicTpuConnection {
|
||||||
where
|
where
|
||||||
T: AsRef<[u8]>,
|
T: AsRef<[u8]>,
|
||||||
{
|
{
|
||||||
let _guard = self.client.runtime.enter();
|
let _guard = RUNTIME.enter();
|
||||||
let send_batch = self.client.send_batch(buffers);
|
let send_batch = self.client.send_batch(buffers);
|
||||||
self.client.runtime.block_on(send_batch)?;
|
RUNTIME.block_on(send_batch)?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn send_wire_transaction_async(&self, wire_transaction: Vec<u8>) -> TransportResult<()> {
|
||||||
|
let _guard = RUNTIME.enter();
|
||||||
|
//drop and detach the task
|
||||||
|
let client = self.client.clone();
|
||||||
|
inc_new_counter_info!("send_wire_transaction_async", 1);
|
||||||
|
let _ = RUNTIME.spawn(async move {
|
||||||
|
let send_buffer = client.send_buffer(wire_transaction);
|
||||||
|
if let Err(e) = send_buffer.await {
|
||||||
|
inc_new_counter_warn!("send_wire_transaction_async_fail", 1);
|
||||||
|
warn!("Failed to send transaction async to {:?}", e);
|
||||||
|
} else {
|
||||||
|
inc_new_counter_info!("send_wire_transaction_async_pass", 1);
|
||||||
|
}
|
||||||
|
});
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl QuicClient {
|
impl QuicClient {
|
||||||
pub fn new(client_socket: UdpSocket, addr: SocketAddr) -> Self {
|
pub fn new(client_socket: UdpSocket, addr: SocketAddr) -> Self {
|
||||||
let runtime = tokio::runtime::Builder::new_multi_thread()
|
let _guard = RUNTIME.enter();
|
||||||
.enable_all()
|
|
||||||
.build()
|
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
let _guard = runtime.enter();
|
|
||||||
|
|
||||||
let crypto = rustls::ClientConfig::builder()
|
let crypto = rustls::ClientConfig::builder()
|
||||||
.with_safe_defaults()
|
.with_safe_defaults()
|
||||||
|
@ -100,12 +119,11 @@ impl QuicClient {
|
||||||
|
|
||||||
let create_endpoint = QuicClient::create_endpoint(EndpointConfig::default(), client_socket);
|
let create_endpoint = QuicClient::create_endpoint(EndpointConfig::default(), client_socket);
|
||||||
|
|
||||||
let mut endpoint = runtime.block_on(create_endpoint);
|
let mut endpoint = RUNTIME.block_on(create_endpoint);
|
||||||
|
|
||||||
endpoint.set_default_client_config(ClientConfig::new(Arc::new(crypto)));
|
endpoint.set_default_client_config(ClientConfig::new(Arc::new(crypto)));
|
||||||
|
|
||||||
Self {
|
Self {
|
||||||
runtime,
|
|
||||||
endpoint,
|
endpoint,
|
||||||
connection: Arc::new(Mutex::new(None)),
|
connection: Arc::new(Mutex::new(None)),
|
||||||
addr,
|
addr,
|
||||||
|
|
|
@ -22,6 +22,8 @@ pub trait TpuConnection {
|
||||||
where
|
where
|
||||||
T: AsRef<[u8]>;
|
T: AsRef<[u8]>;
|
||||||
|
|
||||||
|
fn send_wire_transaction_async(&self, wire_transaction: Vec<u8>) -> TransportResult<()>;
|
||||||
|
|
||||||
fn par_serialize_and_send_transaction_batch(
|
fn par_serialize_and_send_transaction_batch(
|
||||||
&self,
|
&self,
|
||||||
transactions: &[VersionedTransaction],
|
transactions: &[VersionedTransaction],
|
||||||
|
|
|
@ -34,6 +34,11 @@ impl TpuConnection for UdpTpuConnection {
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn send_wire_transaction_async(&self, wire_transaction: Vec<u8>) -> TransportResult<()> {
|
||||||
|
self.socket.send_to(wire_transaction.as_ref(), self.addr)?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
fn send_wire_transaction_batch<T>(&self, buffers: &[T]) -> TransportResult<()>
|
fn send_wire_transaction_batch<T>(&self, buffers: &[T]) -> TransportResult<()>
|
||||||
where
|
where
|
||||||
T: AsRef<[u8]>,
|
T: AsRef<[u8]>,
|
||||||
|
|
|
@ -3376,6 +3376,7 @@ dependencies = [
|
||||||
"solana-clap-utils",
|
"solana-clap-utils",
|
||||||
"solana-faucet",
|
"solana-faucet",
|
||||||
"solana-measure",
|
"solana-measure",
|
||||||
|
"solana-metrics",
|
||||||
"solana-net-utils",
|
"solana-net-utils",
|
||||||
"solana-sdk",
|
"solana-sdk",
|
||||||
"solana-streamer",
|
"solana-streamer",
|
||||||
|
|
|
@ -311,7 +311,9 @@ impl SendTransactionService {
|
||||||
fn send_transaction(tpu_address: &SocketAddr, wire_transaction: &[u8]) {
|
fn send_transaction(tpu_address: &SocketAddr, wire_transaction: &[u8]) {
|
||||||
let mut measure = Measure::start("send_transaction_service-us");
|
let mut measure = Measure::start("send_transaction_service-us");
|
||||||
|
|
||||||
if let Err(err) = connection_cache::send_wire_transaction(wire_transaction, tpu_address) {
|
if let Err(err) =
|
||||||
|
connection_cache::send_wire_transaction_async(wire_transaction.to_vec(), tpu_address)
|
||||||
|
{
|
||||||
warn!("Failed to send transaction to {}: {:?}", tpu_address, err);
|
warn!("Failed to send transaction to {}: {:?}", tpu_address, err);
|
||||||
}
|
}
|
||||||
measure.stop();
|
measure.stop();
|
||||||
|
|
Loading…
Reference in New Issue