Refactor connection cache to support generic msgs (solana-labs#29774)

tpu-client/tpu_connection_cache is refactored out the module and moved to connection-cache/connection_cache and the logic in client/connection_cache is consolidated to connection-cache/connection_cache as well. client/connection_cache only has a thin wrapper which forward calls to connection-cache/connection_cache and deal with constructions of quic/udp connection cache for clients using them both.2. The TpuConnection is refactored to ClientConnection to make it generic and functions renamed to be proper for other workflows. eg. tpu_addr -> server_addr, send_transaction --> send_data and etc... The enum dispatch is removed so that we can make the bulk of code of quic and udp agnostic of each other. The client is possible to load quic or udp only into its runtime. The generic type parameter in the tpu-client/tpu_connection_cache is removed in order to create both quic and udp connection cache and use the object to send transactions with multiple branching when sending data. The generic type parameters and associated types are dropped in other types in order to make the trait "object safe" for this purpose. I have annotated the code explaining the reasoning and the refactoring source -> destination. There is no functional changes bench-tps has been performed for rpc-client, thin-client and tpu-client. And it is found the performance number largely match the ones before the refactoring.
davpal71 · Feb 2, 2023 · ada6136 · ada6136
1 parent 1cab61d
commit ada6136
Show file tree

Hide file tree

Showing 54 changed files with 911 additions and 1,485 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -18,6 +18,7 @@ members = [
     "cli-output",
     "client",
     "client-test",
+    "connection-cache",
     "core",
     "dos",
     "download-utils",

diff --git a/banking-bench/src/main.rs b/banking-bench/src/main.rs
@@ -32,7 +32,7 @@ use {
         transaction::Transaction,
     },
     solana_streamer::socket::SocketAddrSpace,
-    solana_tpu_client::tpu_connection_cache::DEFAULT_TPU_CONNECTION_POOL_SIZE,
+    solana_tpu_client::tpu_client::DEFAULT_TPU_CONNECTION_POOL_SIZE,
     std::{
         sync::{atomic::Ordering, Arc, RwLock},
         thread::sleep,

diff --git a/bench-tps/src/cli.rs b/bench-tps/src/cli.rs
@@ -8,9 +8,7 @@ use {
         pubkey::Pubkey,
         signature::{read_keypair_file, Keypair},
     },
-    solana_tpu_client::tpu_connection_cache::{
-        DEFAULT_TPU_CONNECTION_POOL_SIZE, DEFAULT_TPU_USE_QUIC,
-    },
+    solana_tpu_client::tpu_client::{DEFAULT_TPU_CONNECTION_POOL_SIZE, DEFAULT_TPU_USE_QUIC},
     std::{
         net::{Ipv4Addr, SocketAddr},
         process::exit,

diff --git a/cli/src/cli.rs b/cli/src/cli.rs
@@ -31,7 +31,7 @@ use {
         stake::{instruction::LockupArgs, state::Lockup},
         transaction::{TransactionError, VersionedTransaction},
     },
-    solana_tpu_client::tpu_connection_cache::DEFAULT_TPU_ENABLE_UDP,
+    solana_tpu_client::tpu_client::DEFAULT_TPU_ENABLE_UDP,
     solana_vote_program::vote_state::VoteAuthorize,
     std::{collections::HashMap, error, io::stdout, str::FromStr, sync::Arc, time::Duration},
     thiserror::Error,

diff --git a/cli/src/main.rs b/cli/src/main.rs
@@ -17,7 +17,7 @@ use {
     },
     solana_remote_wallet::remote_wallet::RemoteWalletManager,
     solana_rpc_client_api::config::RpcSendTransactionConfig,
-    solana_tpu_client::tpu_connection_cache::DEFAULT_TPU_ENABLE_UDP,
+    solana_tpu_client::tpu_client::DEFAULT_TPU_ENABLE_UDP,
     std::{collections::HashMap, error, path::PathBuf, sync::Arc, time::Duration},
 };
 

diff --git a/client/Cargo.toml b/client/Cargo.toml
@@ -21,6 +21,8 @@ log = "0.4.17"
 quinn = "0.9.3"
 rand = "0.7.0"
 rayon = "1.5.3"
+
+solana-connection-cache = { path = "../connection-cache", version = "=1.16.0" }
 solana-measure = { path = "../measure", version = "=1.16.0" }
 solana-metrics = { path = "../metrics", version = "=1.16.0" }
 solana-net-utils = { path = "../net-utils", version = "=1.16.0" }