diff --git a/src/bin/testnode.rs b/src/bin/testnode.rs index 51e4e4527b..715506263c 100644 --- a/src/bin/testnode.rs +++ b/src/bin/testnode.rs @@ -118,6 +118,10 @@ fn main() { let exit = Arc::new(AtomicBool::new(false)); let rpu = Rpu::new(bank, last_id, Some(Duration::from_millis(1000))); let serve_sock = UdpSocket::bind(&serve_addr).unwrap(); + serve_sock + .set_read_timeout(Some(Duration::new(1, 0))) + .unwrap(); + let gossip_sock = UdpSocket::bind(&gossip_addr).unwrap(); let replicate_sock = UdpSocket::bind(&replicate_addr).unwrap(); let _events_sock = UdpSocket::bind(&events_addr).unwrap(); diff --git a/src/streamer.rs b/src/streamer.rs index f3332fbc08..7e08d16ce8 100644 --- a/src/streamer.rs +++ b/src/streamer.rs @@ -53,8 +53,6 @@ pub fn receiver( recycler: PacketRecycler, channel: PacketSender, ) -> Result> { - let timer = Duration::new(1, 0); - sock.set_read_timeout(Some(timer))?; Ok(spawn(move || { let _ = recv_loop(&sock, &exit, &recycler, &channel); () @@ -515,6 +513,8 @@ mod bench { } fn run_streamer_bench() -> Result<()> { let read = UdpSocket::bind("127.0.0.1:0")?; + read.set_read_timeout(Some(Duration::new(1, 0)))?; + let addr = read.local_addr()?; let exit = Arc::new(AtomicBool::new(false)); let pack_recycler = PacketRecycler::default(); diff --git a/src/thin_client.rs b/src/thin_client.rs index 01363c0e5a..53bf7032d0 100644 --- a/src/thin_client.rs +++ b/src/thin_client.rs @@ -178,6 +178,7 @@ mod tests { logger::setup(); let gossip = UdpSocket::bind("0.0.0.0:0").unwrap(); let serve = UdpSocket::bind("0.0.0.0:0").unwrap(); + serve.set_read_timeout(Some(Duration::new(1, 0))).unwrap(); let _events_socket = UdpSocket::bind("0.0.0.0:0").unwrap(); let addr = serve.local_addr().unwrap(); let pubkey = KeyPair::new().pubkey(); @@ -274,6 +275,8 @@ mod tests { fn test_node() -> (ReplicatedData, UdpSocket, UdpSocket, UdpSocket, UdpSocket) { let gossip = UdpSocket::bind("0.0.0.0:0").unwrap(); let serve = UdpSocket::bind("0.0.0.0:0").unwrap(); + serve.set_read_timeout(Some(Duration::new(1, 0))).unwrap(); + let events_socket = UdpSocket::bind("0.0.0.0:0").unwrap(); let replicate = UdpSocket::bind("0.0.0.0:0").unwrap(); let pubkey = KeyPair::new().pubkey(); diff --git a/src/tvu.rs b/src/tvu.rs index d26171d709..8634a99de5 100644 --- a/src/tvu.rs +++ b/src/tvu.rs @@ -212,6 +212,9 @@ pub fn test_node() -> (ReplicatedData, UdpSocket, UdpSocket, UdpSocket, UdpSocke let gossip = UdpSocket::bind("127.0.0.1:0").unwrap(); let replicate = UdpSocket::bind("127.0.0.1:0").unwrap(); let requests_socket = UdpSocket::bind("127.0.0.1:0").unwrap(); + requests_socket + .set_read_timeout(Some(Duration::new(1, 0))) + .unwrap(); let pubkey = KeyPair::new().pubkey(); let d = ReplicatedData::new( pubkey,