decollision ports better

Author: alexpyattaev

gossip/src/cluster_info.rs

@@ -2417,9 +2417,7 @@ impl Node {
     pub fn new_localhost_with_pubkey(pubkey: &Pubkey) -> Self {
         let addr = IpAddr::V4(Ipv4Addr::LOCALHOST);
         let port_range = localhost_port_range_for_tests();
-        let gossip_port = find_available_port_in_range(addr, port_range)
-            .expect("At least one open port should be available");
-        let gossip_addr = SocketAddr::new(addr, gossip_port);
+        let gossip_addr = SocketAddr::new(addr, port_range.0);
         #[allow(deprecated)] // new_single_bind will be merged in this function
         Self::new_single_bind(pubkey, &gossip_addr, port_range, addr)
     }
@@ -2485,19 +2483,18 @@ impl Node {
             num_tvu_receive_sockets.get(),
         )
         .expect("tvu multi_bind");
-
         let (tvu_quic_port, tvu_quic) =
             Self::bind_with_config(bind_ip_addr, port_range, socket_config);
-
         let (tpu_port, tpu_sockets) =
             multi_bind_in_range_with_config(bind_ip_addr, port_range, socket_config_reuseport, 32)
                 .expect("tpu multi_bind");
 
-        let (_tpu_port_quic, tpu_quic) = Self::bind_with_config(
+        let (_tpu_port_quic, tpu_quic) = bind_in_range_with_config(
             bind_ip_addr,
             (tpu_port + QUIC_PORT_OFFSET, tpu_port + QUIC_PORT_OFFSET + 1),
             socket_config_reuseport,
-        );
+        )
+        .expect("TPU quic port bind should succeed");
         let tpu_quic =
             bind_more_with_config(tpu_quic, num_quic_endpoints.get(), socket_config_reuseport)
                 .unwrap();
@@ -2506,14 +2503,15 @@ impl Node {
             multi_bind_in_range_with_config(bind_ip_addr, port_range, socket_config_reuseport, 8)
                 .expect("tpu_forwards multi_bind");
 
-        let (_tpu_forwards_port_quic, tpu_forwards_quic) = Self::bind_with_config(
+        let (_tpu_forwards_port_quic, tpu_forwards_quic) = bind_in_range_with_config(
             bind_ip_addr,
             (
                 tpu_forwards_port + QUIC_PORT_OFFSET,
                 tpu_forwards_port + QUIC_PORT_OFFSET + 1,
             ),
             socket_config_reuseport,
-        );
+        )
+        .expect("TPU QUIC binding should succeed");
         let tpu_forwards_quic = bind_more_with_config(
             tpu_forwards_quic,
             num_quic_endpoints.get(),

net-utils/src/sockets.rs

@@ -6,28 +6,35 @@ use {
     },
 };
 
-const BASE_PORT: u16 = 20000;
+const BASE_PORT: u16 = 5000;
 
 /// Retrieve a free 100-port slice for unit tests
 ///
-/// When running under nextest, this is guaranteed to provide
+/// When running under nextest, this will try to provide
 /// a unique slice of port numbers (assuming no other nextest processes
 /// are running on the same host) based on NEXTEST_TEST_GLOBAL_SLOT variable
 /// The port ranges will be reused following nextest logic.
 ///
-/// When running without nextest, this will bump an atomic and eventually
+/// When running without nextest, this will only bump an atomic and eventually
 /// panic when it runs out of port numbers to assign.
 pub fn localhost_port_range_for_tests() -> (u16, u16) {
-    static SLICE: AtomicU16 = AtomicU16::new(BASE_PORT);
-    let start = match std::env::var("NEXTEST_TEST_GLOBAL_SLOT") {
-        Ok(slot) => {
-            let slot: u16 = slot.parse().unwrap();
-            BASE_PORT + slot * 100
-        }
-        Err(_) => SLICE.fetch_add(100, Ordering::Relaxed),
-    };
+    static SLICE: AtomicU16 = AtomicU16::new(0);
+    let offset = SLICE.fetch_add(20, Ordering::Relaxed);
+    let start = offset
+        + match std::env::var("NEXTEST_TEST_GLOBAL_SLOT") {
+            Ok(slot) => {
+                let slot: u16 = slot.parse().unwrap();
+                assert!(
+                    offset < 1000,
+                    "Overrunning into the port range of another test!"
+                );
+
+                BASE_PORT + slot * 1000
+            }
+            Err(_) => BASE_PORT,
+        };
     assert!(start < 65500, "ran out of port numbers!");
-    (start, start + 100)
+    (start, start + 20)
 }
 
 pub fn get_gossip_port(