Readme.md fmt

anza-xyz · Oct 30, 2024 · 257e49a · 257e49a
1 parent ba65a02
commit 257e49a
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 40 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/streamer/src/quic.rs b/streamer/src/quic.rs
@@ -632,6 +632,7 @@ pub fn spawn_server(
     )
 }
 
+#[derive(Clone)]
 pub struct QuicServerParams {
     pub max_connections_per_peer: usize,
     pub max_staked_connections: usize,

diff --git a/vortexor/src/main.rs b/vortexor/src/main.rs
@@ -4,7 +4,7 @@ use {
     solana_clap_utils::input_parsers::keypair_of,
     solana_net_utils::{bind_in_range_with_config, bind_more_with_config, SocketConfig},
     solana_sdk::net::DEFAULT_TPU_COALESCE,
-    solana_streamer::{nonblocking::quic::DEFAULT_WAIT_FOR_CHUNK_TIMEOUT, streamer::StakedNodes},
+    solana_streamer::{nonblocking::quic::DEFAULT_WAIT_FOR_CHUNK_TIMEOUT, quic::QuicServerParams, streamer::StakedNodes},
     solana_vortexor::{
         cli::{app, DefaultArgs},
         vortexor::{TpuSockets, TpuStreamerConfig, Vortexor},
@@ -54,13 +54,15 @@ pub fn main() {
         tpu_metrics_name: "quic_streamer_tpu",
         tpu_fwd_thread_name: "solQuicTpuFwd",
         tpu_fwd_metrics_name: "quic_streamer_tpu_forwards",
-        max_connections_per_peer: max_connections_per_peer.try_into().unwrap(),
-        max_staked_connections: max_tpu_staked_connections.try_into().unwrap(),
-        max_unstaked_connections: max_tpu_unstaked_connections.try_into().unwrap(),
-        max_streams_per_ms,
-        max_connections_per_ipaddr_per_min,
-        wait_for_chunk_timeout: DEFAULT_WAIT_FOR_CHUNK_TIMEOUT,
-        sender_coalesce_duration: tpu_coalesce,
+        quic_server_params: QuicServerParams {
+            max_connections_per_peer: max_connections_per_peer.try_into().unwrap(),
+            max_staked_connections: max_tpu_staked_connections.try_into().unwrap(),
+            max_unstaked_connections: max_tpu_unstaked_connections.try_into().unwrap(),
+            max_streams_per_ms,
+            max_connections_per_ipaddr_per_min,
+            wait_for_chunk_timeout: DEFAULT_WAIT_FOR_CHUNK_TIMEOUT,
+            coalesce: tpu_coalesce,
+            }
     };
 
     let quic_config = SocketConfig { reuseport: true };

diff --git a/vortexor/src/vortexor.rs b/vortexor/src/vortexor.rs
@@ -3,14 +3,13 @@ use {
     solana_perf::packet::PacketBatch,
     solana_sdk::{quic::NotifyKeyUpdate, signature::Keypair},
     solana_streamer::{
-        quic::{spawn_server_multi, EndpointKeyUpdater},
+        quic::{spawn_server_multi, EndpointKeyUpdater, QuicServerParams},
         streamer::StakedNodes,
     },
     std::{
         net::UdpSocket,
         sync::{atomic::AtomicBool, Arc, Mutex, RwLock},
         thread::{self, JoinHandle},
-        time::Duration,
     },
 };
 
@@ -27,13 +26,7 @@ pub struct TpuStreamerConfig {
     pub tpu_metrics_name: &'static str,
     pub tpu_fwd_thread_name: &'static str,
     pub tpu_fwd_metrics_name: &'static str,
-    pub max_connections_per_peer: usize,
-    pub max_staked_connections: usize,
-    pub max_unstaked_connections: usize,
-    pub max_streams_per_ms: u64,
-    pub max_connections_per_ipaddr_per_min: u64,
-    pub wait_for_chunk_timeout: Duration,
-    pub sender_coalesce_duration: Duration,
+    pub quic_server_params: QuicServerParams,
 }
 
 pub struct Vortexor {
@@ -84,48 +77,36 @@ impl Vortexor {
             tpu_metrics_name,
             tpu_fwd_thread_name,
             tpu_fwd_metrics_name,
-            max_connections_per_peer,
-            max_staked_connections,
-            max_unstaked_connections,
-            max_streams_per_ms,
-            max_connections_per_ipaddr_per_min,
-            wait_for_chunk_timeout,
-            sender_coalesce_duration,
+            mut quic_server_params,
         } = config;
 
+
         let tpu_result = spawn_server_multi(
             tpu_thread_name,
             tpu_metrics_name,
             tpu_quic,
             keypair,
             tpu_sender.clone(),
             exit.clone(),
-            max_connections_per_peer,
             staked_nodes.clone(),
-            max_staked_connections,
-            max_unstaked_connections,
-            max_streams_per_ms,
-            max_connections_per_ipaddr_per_min,
-            wait_for_chunk_timeout,
-            sender_coalesce_duration,
+            quic_server_params.clone(),
         )
         .unwrap();
 
+        // Fot TPU forward -- we disallow unstaked connections. Allocate all connection resources
+        // for staked connections:
+        quic_server_params.max_staked_connections += quic_server_params.max_unstaked_connections;
+        quic_server_params.max_unstaked_connections = 0;
         let tpu_fwd_result = spawn_server_multi(
             tpu_fwd_thread_name,
             tpu_fwd_metrics_name,
             tpu_quic_fwd,
             keypair,
             tpu_fwd_sender,
             exit.clone(),
-            max_connections_per_peer,
             staked_nodes.clone(),
-            max_staked_connections,
-            max_unstaked_connections,
-            max_streams_per_ms,
-            max_connections_per_ipaddr_per_min,
-            wait_for_chunk_timeout,
-            sender_coalesce_duration,
+            quic_server_params
+
         )
         .unwrap();