rpc port alloc fix

Author: alexpyattaev

gossip/src/cluster_info.rs

@@ -52,7 +52,7 @@ use {
     solana_ledger::shred::Shred,
     solana_net_utils::{
         bind_in_range, bind_in_range_with_config, bind_more_with_config, bind_to_unspecified,
-        bind_to_with_config, find_available_port_in_range, multi_bind_in_range_with_config,
+        bind_to_with_config, find_available_ports_in_range, multi_bind_in_range_with_config,
         sockets::{get_gossip_port, localhost_port_range_for_tests},
         PortRange, SocketConfig, VALIDATOR_PORT_RANGE,
     },
@@ -2449,8 +2449,9 @@ impl Node {
                 .expect("Number of QUIC endpoints can not be zero"),
         };
         let mut node = Self::new_with_external_ip(pubkey, config);
-        let rpc_port = find_available_port_in_range(bind_ip_addr, port_range).unwrap();
-        let rpc_pubsub_port = find_available_port_in_range(bind_ip_addr, port_range).unwrap();
+        let rpc_ports = find_available_ports_in_range(bind_ip_addr, port_range, 2).unwrap();
+        let rpc_port = rpc_ports[0];
+        let rpc_pubsub_port = rpc_ports[1];
         node.info.set_rpc((bind_ip_addr, rpc_port)).unwrap();
         node.info
             .set_rpc_pubsub((bind_ip_addr, rpc_pubsub_port))

net-utils/src/lib.rs

@@ -607,18 +607,28 @@ pub fn bind_two_in_range_with_offset_and_config(
 /// This will start at a random point in the range provided, and search sequenctially.
 /// If it can not find anything, an Error is returned.
 pub fn find_available_port_in_range(ip_addr: IpAddr, range: PortRange) -> io::Result<u16> {
+    find_available_ports_in_range(ip_addr, range, 1).map(|v| *v.first().unwrap())
+}
+
+pub fn find_available_ports_in_range(
+    ip_addr: IpAddr,
+    range: PortRange,
+    mut num: usize,
+) -> io::Result<Vec<u16>> {
+    let mut result = vec![];
     let range = range.0..range.1;
     let mut next_port_to_try = range
         .clone()
         .cycle() // loop over the end of the range
         .skip(thread_rng().gen_range(range.clone()) as usize) // skip to random position
         .take(range.len()) // never take the same value twice
         .peekable();
-    loop {
+    while num > 0 {
         let port_to_try = next_port_to_try.next().unwrap(); // this unwrap never fails since we exit earlier
         match bind_common(ip_addr, port_to_try) {
             Ok(_) => {
-                return Ok(port_to_try);
+                num -= 1;
+                result.push(port_to_try);
             }
             Err(err) => {
                 if next_port_to_try.peek().is_none() {
@@ -627,6 +637,7 @@ pub fn find_available_port_in_range(ip_addr: IpAddr, range: PortRange) -> io::Re
             }
         }
     }
+    return Ok(result);
 }
 
 pub fn bind_more_with_config(

test-validator/src/lib.rs

@@ -967,8 +967,9 @@ impl TestValidator {
             node.info.set_rpc((addr, rpc)).unwrap();
             node.info.set_rpc_pubsub((addr, rpc_pubsub)).unwrap();
         } else {
-            let rpc_port = find_available_port_in_range(addr, port_range).unwrap();
-            let rpc_pubsub_port = find_available_port_in_range(addr, port_range).unwrap();
+            let rpc_ports = find_available_ports_in_range(bind_ip_addr, port_range, 2).unwrap();
+            let rpc_port = rpc_ports[0];
+            let rpc_pubsub_port = rpc_ports[1];
             node.info.set_rpc((addr, rpc_port)).unwrap();
             node.info.set_rpc_pubsub((addr, rpc_pubsub_port)).unwrap();
         }