From 357339273f8e8cadee792337cf34738feeaa9f91 Mon Sep 17 00:00:00 2001
From: Stephen Akridge <sakridge@gmail.com>
Date: Sun, 14 Jun 2020 09:58:21 -0700
Subject: [PATCH] Revert "Look at repair peers"

This reverts commit 0013bfff4e4b6a9ec4895ec4ef8d074691932da4.
---
 core/src/serve_repair.rs | 17 +----------------
 streamer/src/streamer.rs |  1 -
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/core/src/serve_repair.rs b/core/src/serve_repair.rs
index 3b42e35b9f..0610333e2e 100644
--- a/core/src/serve_repair.rs
+++ b/core/src/serve_repair.rs
@@ -207,7 +207,6 @@ impl ServeRepair {
         response_sender: &PacketSender,
         stats: &mut ServeRepairStats,
         max_packets: &mut usize,
-        repairs_by_peer: &mut HashMap<String, usize>,
     ) -> Result<()> {
         //TODO cache connections
         let timeout = Duration::new(1, 0);
@@ -230,15 +229,7 @@ impl ServeRepair {
 
         let mut time = Measure::start("repair::handle_packets");
         for reqs in reqs_v {
-            Self::handle_packets(
-                obj,
-                &recycler,
-                blockstore,
-                reqs,
-                response_sender,
-                stats,
-                repairs_by_peer,
-            );
+            Self::handle_packets(obj, &recycler, blockstore, reqs, response_sender, stats);
         }
         time.stop();
         if total_packets >= *max_packets {
@@ -294,7 +285,6 @@ impl ServeRepair {
                 let mut last_print = Instant::now();
                 let mut stats = ServeRepairStats::default();
                 let mut max_packets = 1024;
-                let mut repairs_by_peer = HashMap::new();
                 loop {
                     let result = Self::run_listen(
                         &me,
@@ -304,7 +294,6 @@ impl ServeRepair {
                         &response_sender,
                         &mut stats,
                         &mut max_packets,
-                        &mut repairs_by_peer,
                     );
                     match result {
                         Err(Error::RecvTimeoutError(_)) | Ok(_) => {}
@@ -316,8 +305,6 @@ impl ServeRepair {
                     if last_print.elapsed().as_secs() > 2 {
                         Self::report_reset_stats(&me, &mut stats);
                         last_print = Instant::now();
-                        info!("repairs_by_peer: {:#?}", repairs_by_peer);
-                        repairs_by_peer.clear();
                     }
                     thread_mem_usage::datapoint("solana-repair-listen");
                 }
@@ -332,14 +319,12 @@ impl ServeRepair {
         packets: Packets,
         response_sender: &PacketSender,
         stats: &mut ServeRepairStats,
-        repairs_by_peer: &mut HashMap<String, usize>,
     ) {
         // iter over the packets
         let allocated = thread_mem_usage::Allocatedp::default();
         packets.packets.iter().for_each(|packet| {
             let start = allocated.get();
             let from_addr = packet.meta.addr();
-            *repairs_by_peer.entry(from_addr.to_string()).or_insert(0) += 1;
             limited_deserialize(&packet.data[..packet.meta.size])
                 .into_iter()
                 .for_each(|request| {
diff --git a/streamer/src/streamer.rs b/streamer/src/streamer.rs
index 393f762d0a..2181a71be9 100644
--- a/streamer/src/streamer.rs
+++ b/streamer/src/streamer.rs
@@ -133,7 +133,6 @@ pub fn responder(name: &'static str, sock: Arc<UdpSocket>, r: PacketReceiver) ->
                 match e {
                     StreamerError::RecvTimeoutError(RecvTimeoutError::Disconnected) => break,
                     StreamerError::RecvTimeoutError(RecvTimeoutError::Timeout) => (),
-                    StreamerError::IO(_) => (),
                     _ => info!("{} responder error: {:?}", name, e),
                 }
             }