add stats reporting thread

core/src/lib.rs

@@ -52,6 +52,7 @@ pub mod sigverify;
 pub mod sigverify_shreds;
 pub mod sigverify_stage;
 pub mod snapshot_packager_service;
+pub mod stats_reporter_service;
 pub mod system_monitor_service;
 pub mod tower_storage;
 pub mod tpu;

core/src/serve_repair_service.rs

@@ -5,7 +5,11 @@ use {
     solana_streamer::{socket::SocketAddrSpace, streamer},
     std::{
         net::UdpSocket,
-        sync::{atomic::AtomicBool, mpsc::channel, Arc, RwLock},
+        sync::{
+            atomic::AtomicBool,
+            mpsc::{channel, Sender},
+            Arc, RwLock,
+        },
         thread::{self, JoinHandle},
     },
 };
@@ -20,6 +24,7 @@ impl ServeRepairService {
         blockstore: Option<Arc<Blockstore>>,
         serve_repair_socket: UdpSocket,
         socket_addr_space: SocketAddrSpace,
+        stats_reporter_sender: Sender<Box<dyn FnOnce() + Send>>,
         exit: &Arc<AtomicBool>,
     ) -> Self {
         let (request_sender, request_receiver) = channel();
@@ -44,6 +49,7 @@ impl ServeRepairService {
             serve_repair_socket,
             response_receiver,
             socket_addr_space,
+            Some(stats_reporter_sender),
         );
         let t_listen = ServeRepair::listen(
             serve_repair.clone(),

core/src/stats_reporter_service.rs

@@ -0,0 +1,53 @@
+use std::{
+    result::Result,
+    sync::{
+        atomic::{AtomicBool, Ordering},
+        mpsc::{Receiver, RecvTimeoutError},
+        Arc,
+    },
+    thread::{self, Builder, JoinHandle},
+    time::Duration,
+};
+
+pub struct StatsReporterService {
+    thread_hdl: JoinHandle<()>,
+}
+
+impl StatsReporterService {
+    pub fn new(
+        reporting_receiver: Receiver<Box<dyn FnOnce() + Send>>,
+        exit: &Arc<AtomicBool>,
+    ) -> Self {
+        let exit = exit.clone();
+        let thread_hdl = Builder::new()
+            .name("solana-stats-reporter".to_owned())
+            .spawn(move || loop {
+                if exit.load(Ordering::Relaxed) {
+                    return;
+                }
+                if let Err(e) = Self::receive_reporting_func(&reporting_receiver) {
+                    match e {
+                        RecvTimeoutError::Disconnected => break,
+                        RecvTimeoutError::Timeout => (),
+                    }
+                }
+            })
+            .unwrap();
+
+        Self { thread_hdl }
+    }
+
+    pub fn join(self) -> thread::Result<()> {
+        self.thread_hdl.join()?;
+        Ok(())
+    }
+
+    fn receive_reporting_func(
+        r: &Receiver<Box<dyn FnOnce() + Send>>,
+    ) -> Result<(), RecvTimeoutError> {
+        let timer = Duration::new(1, 0);
+        let func = r.recv_timeout(timer)?;
+        func();
+        Ok(())
+    }
+}

core/src/validator.rs

@@ -14,6 +14,7 @@ use {
         serve_repair_service::ServeRepairService,
         sigverify,
         snapshot_packager_service::SnapshotPackagerService,
+        stats_reporter_service::StatsReporterService,
         system_monitor_service::{verify_udp_stats_access, SystemMonitorService},
         tower_storage::TowerStorage,
         tpu::{Tpu, DEFAULT_TPU_COALESCE_MS},
@@ -276,6 +277,7 @@ pub struct Validator {
     cache_block_meta_service: Option<CacheBlockMetaService>,
     system_monitor_service: Option<SystemMonitorService>,
     sample_performance_service: Option<SamplePerformanceService>,
+    stats_reporter_service: StatsReporterService,
     gossip_service: GossipService,
     serve_repair_service: ServeRepairService,
     completed_data_sets_service: CompletedDataSetsService,
@@ -695,12 +697,17 @@ impl Validator {
                 Some(node.info.shred_version),
             )),
         };
+
+        let (stats_reporter_sender, stats_reporter_receiver) = channel();
+        let stats_reporter_service = StatsReporterService::new(stats_reporter_receiver, &exit);
+
         let gossip_service = GossipService::new(
             &cluster_info,
             Some(bank_forks.clone()),
             node.sockets.gossip,
             config.gossip_validators.clone(),
             should_check_duplicate_instance,
+            Some(stats_reporter_sender.clone()),
             &exit,
         );
         let serve_repair = Arc::new(RwLock::new(ServeRepair::new(cluster_info.clone())));
@@ -709,6 +716,7 @@ impl Validator {
             Some(blockstore.clone()),
             node.sockets.serve_repair,
             socket_addr_space,
+            stats_reporter_sender,
             &exit,
         );
 
@@ -902,6 +910,7 @@ impl Validator {
 
         *start_progress.write().unwrap() = ValidatorStartProgress::Running;
         Self {
+            stats_reporter_service,
             gossip_service,
             serve_repair_service,
             json_rpc_service,
@@ -1026,6 +1035,9 @@ impl Validator {
         self.serve_repair_service
             .join()
             .expect("serve_repair_service");
+        self.stats_reporter_service
+            .join()
+            .expect("stats_reporter_service");
         self.tpu.join().expect("tpu");
         self.tvu.join().expect("tvu");
         self.completed_data_sets_service

gossip/src/gossip_service.rs

@@ -19,7 +19,7 @@ use {
         net::{IpAddr, Ipv4Addr, SocketAddr, TcpListener, UdpSocket},
         sync::{
             atomic::{AtomicBool, Ordering},
-            mpsc::channel,
+            mpsc::{channel, Sender},
             Arc, RwLock,
         },
         thread::{self, sleep, JoinHandle},
@@ -38,6 +38,7 @@ impl GossipService {
         gossip_socket: UdpSocket,
         gossip_validators: Option<HashSet<Pubkey>>,
         should_check_duplicate_instance: bool,
+        stats_reporter_sender: Option<Sender<Box<dyn FnOnce() + Send>>>,
         exit: &Arc<AtomicBool>,
     ) -> Self {
         let (request_sender, request_receiver) = channel();
@@ -88,6 +89,7 @@ impl GossipService {
             gossip_socket,
             response_receiver,
             socket_addr_space,
+            stats_reporter_sender,
         );
         let thread_hdls = vec![
             t_receiver,
@@ -331,6 +333,7 @@ pub fn make_gossip_node(
         gossip_socket,
         None,
         should_check_duplicate_instance,
+        None,
         exit,
     );
     (gossip_service, ip_echo, cluster_info)

replica-node/src/replica_util.rs

@@ -221,6 +221,7 @@ fn start_gossip_node(
         gossip_socket,
         gossip_validators,
         should_check_duplicate_instance,
+        None,
         &gossip_exit_flag,
     );
     info!("Started gossip node");

streamer/src/streamer.rs

@@ -135,8 +135,11 @@ struct StreamerSendStats {
 }
 
 impl StreamerSendStats {
-    fn maybe_submit(&mut self, name: &'static str) {
-        const SUBMIT_CADENCE: Duration = Duration::from_secs(10);
+    fn report_stats(
+        name: &'static str,
+        host_map: HashMap<[u16; 8], SendStats>,
+        sample_duration: Option<Duration>,
+    ) {
         const MAX_REPORT_ENTRIES: usize = 5;
         const MAP_SIZE_REPORTING_THRESHOLD: usize = 1_000;
         let elapsed = self.since.as_ref().map(Instant::elapsed);
@@ -146,11 +149,11 @@ impl StreamerSendStats {
             return;
         }
 
-        let sample_ms = elapsed.map(|e| e.as_millis()).unwrap_or_default();
+        let sample_ms = sample_duration.map(|d| d.as_millis()).unwrap_or_default();
         let mut hist = Histogram::default();
         let mut byte_sum = 0;
         let mut pkt_count = 0;
-        self.host_map.iter().for_each(|(_addr, host_stats)| {
+        host_map.iter().for_each(|(_addr, host_stats)| {
             hist.increment(host_stats.bytes).unwrap();
             byte_sum += host_stats.bytes;
             pkt_count += host_stats.count;
@@ -159,7 +162,7 @@ impl StreamerSendStats {
         datapoint_info!(
             name,
             ("streamer-send-sample_duration_ms", sample_ms, i64),
-            ("streamer-send-host_count", self.host_map.len(), i64),
+            ("streamer-send-host_count", host_map.len(), i64),
             ("streamer-send-bytes_total", byte_sum, i64),
             ("streamer-send-pkt_count_total", pkt_count, i64),
             (
@@ -194,8 +197,8 @@ impl StreamerSendStats {
             ),
         );
 
-        let num_entries = self.host_map.len();
-        let mut entries: Vec<_> = std::mem::take(&mut self.host_map).into_iter().collect();
+        let num_entries = host_map.len();
+        let mut entries: Vec<_> = host_map.into_iter().collect();
         if entries.len() > MAX_REPORT_ENTRIES {
             entries.select_nth_unstable_by_key(MAX_REPORT_ENTRIES, |(_addr, stats)| {
                 Reverse(stats.bytes)
@@ -206,11 +209,27 @@ impl StreamerSendStats {
             "streamer send {} hosts: count:{} {:?}",
             name, num_entries, entries,
         );
+    }
+
+    fn maybe_submit(&mut self, name: &'static str, sender: &Sender<Box<dyn FnOnce() + Send>>) {
+        const SUBMIT_CADENCE: Duration = Duration::from_secs(10);
+        const MAP_SIZE_REPORTING_THRESHOLD: usize = 1_000;
+        let elapsed = self.since.as_ref().map(Instant::elapsed);
+        if elapsed.map(|e| e < SUBMIT_CADENCE).unwrap_or_default()
+            && self.host_map.len() < MAP_SIZE_REPORTING_THRESHOLD
+        {
+            return;
+        }
+
+        let host_map = std::mem::take(&mut self.host_map);
+        let _ = sender.send(Box::new(move || {
+            Self::report_stats(name, host_map, elapsed);
+        }));
 
         *self = Self {
             since: Some(Instant::now()),
             ..Self::default()
-        }
+        };
     }
 
     fn record(&mut self, pkt: &Packet) {
@@ -224,11 +243,13 @@ fn recv_send(
     sock: &UdpSocket,
     r: &PacketReceiver,
     socket_addr_space: &SocketAddrSpace,
-    stats: &mut StreamerSendStats,
+    stats: &mut Option<StreamerSendStats>,
 ) -> Result<()> {
     let timer = Duration::new(1, 0);
     let msgs = r.recv_timeout(timer)?;
-    msgs.packets.iter().for_each(|p| stats.record(p));
+    if let Some(stats) = stats {
+        msgs.packets.iter().for_each(|p| stats.record(p));
+    }
     send_to(&msgs, sock, socket_addr_space)?;
     Ok(())
 }
@@ -255,14 +276,20 @@ pub fn responder(
     sock: Arc<UdpSocket>,
     r: PacketReceiver,
     socket_addr_space: SocketAddrSpace,
+    stats_reporter_sender: Option<Sender<Box<dyn FnOnce() + Send>>>,
 ) -> JoinHandle<()> {
     Builder::new()
         .name(format!("solana-responder-{}", name))
         .spawn(move || {
             let mut errors = 0;
             let mut last_error = None;
             let mut last_print = 0;
-            let mut stats = StreamerSendStats::default();
+            let mut stats = None;
+
+            if stats_reporter_sender.is_some() {
+                stats = Some(StreamerSendStats::default());
+            }
+
             loop {
                 if let Err(e) = recv_send(&sock, &r, &socket_addr_space, &mut stats) {
                     match e {
@@ -281,7 +308,11 @@ pub fn responder(
                     last_print = now;
                     errors = 0;
                 }
-                stats.maybe_submit(name);
+                if let Some(ref stats_reporter_sender) = stats_reporter_sender {
+                    if let Some(ref mut stats) = stats {
+                        stats.maybe_submit(name, stats_reporter_sender);
+                    }
+                }
             }
         })
         .unwrap()

validator/src/bootstrap.rs

@@ -231,6 +231,7 @@ fn start_gossip_node(
         gossip_socket,
         gossip_validators,
         should_check_duplicate_instance,
+        None,
         &gossip_exit_flag,
     );
     (cluster_info, gossip_exit_flag, gossip_service)