temp

Author: nihohit

redis/tests/support/cluster.rs

@@ -124,19 +124,15 @@ impl RedisCluster {
             num_replicas: replicas,
             modules,
             mtls_enabled,
-            mut ports,
+            ports,
         } = configuration;
 
-        if ports.is_empty() {
-            // We use a hashset in order to be sure that we have the right number
-            // of unique ports.
-            let mut hash = std::collections::HashSet::new();
-            while hash.len() < nodes as usize {
-                hash.insert(get_random_available_port());
-            }
-            ports = hash.into_iter().collect();
-        }
-        println!("Chosen ports: {ports:?}");
+        let port_options = if ports.is_empty() {
+            vec![None; nodes as usize]
+        } else {
+            println!("Chosen ports: {ports:?}");
+            ports.into_iter().map(Some).collect()
+        };  
 
         let mut servers = vec![];
         let mut folders = vec![];
@@ -159,7 +155,8 @@ impl RedisCluster {
 
         let max_attempts = 5;
 
-        for port in ports {
+        for port_option in port_options {
+            let port = port_option.unwrap_or_else(get_random_available_port);
             servers.push(RedisServer::new_with_addr_tls_modules_and_spawner(
                 ClusterType::build_addr(port),
                 None,
@@ -199,7 +196,7 @@ impl RedisCluster {
                     folders.push(tempdir);
                     addrs.push(addr.clone());
 
-                    cmd.spawn().unwrap()    
+                    cmd.spawn().unwrap()
                 },
             ));
         }
@@ -209,9 +206,11 @@ impl RedisCluster {
         for server in servers.iter_mut() {
             let process = &mut server.process;
             match process.try_wait() {
-                Ok(Some(status)) => {                                
-                        let contents = std::fs::read_to_string(server.log_file.clone()).unwrap();
-                        panic!("redis server creation failed with status {status:?}.\nlogfile: {contents}");
+                Ok(Some(status)) => {
+                    let contents = std::fs::read_to_string(server.log_file.clone()).unwrap();
+                    panic!(
+                        "redis server creation failed with status {status:?}.\nlogfile: {contents}"
+                    );
                 }
                 Ok(None) => {
                     // wait for 10 seconds for the server to be available.