Fix intermittent CI failure by downscaling test

shotover-proxy/tests/cassandra_int_tests/mod.rs

@@ -305,31 +305,32 @@ async fn cluster_multi_rack_1_per_rack(#[case] driver: CassandraDriver) {
 }
 
 // This is very slow, only test with one driver
+// We previously had this at 3 per rack but this was too much for the github actions runners and resulted in intermittent failures.
 #[rstest]
 #[case::scylla(Scylla)]
 #[tokio::test(flavor = "multi_thread")]
-async fn cluster_multi_rack_3_per_rack(#[case] driver: CassandraDriver) {
+async fn cluster_multi_rack_2_per_rack(#[case] driver: CassandraDriver) {
     let _compose = docker_compose(
-        "tests/test-configs/cassandra/cluster-multi-rack-3-per-rack/docker-compose.yaml",
+        "tests/test-configs/cassandra/cluster-multi-rack-2-per-rack/docker-compose.yaml",
     );
 
     {
         let shotover_rack1 = shotover_process(
-            "tests/test-configs/cassandra/cluster-multi-rack-3-per-rack/topology_rack1.yaml",
+            "tests/test-configs/cassandra/cluster-multi-rack-2-per-rack/topology_rack1.yaml",
         )
         .with_log_name("Rack1")
         .with_observability_port(9001)
         .start()
         .await;
         let shotover_rack2 = shotover_process(
-            "tests/test-configs/cassandra/cluster-multi-rack-3-per-rack/topology_rack2.yaml",
+            "tests/test-configs/cassandra/cluster-multi-rack-2-per-rack/topology_rack2.yaml",
         )
         .with_log_name("Rack2")
         .with_observability_port(9002)
         .start()
         .await;
         let shotover_rack3 = shotover_process(
-            "tests/test-configs/cassandra/cluster-multi-rack-3-per-rack/topology_rack3.yaml",
+            "tests/test-configs/cassandra/cluster-multi-rack-2-per-rack/topology_rack3.yaml",
         )
         .with_log_name("Rack3")
         .with_observability_port(9003)
@@ -354,13 +355,10 @@ async fn cluster_multi_rack_3_per_rack(#[case] driver: CassandraDriver) {
     let expected_nodes: Vec<(SocketAddr, &'static str)> = vec![
         ("172.16.1.2:9042".parse().unwrap(), "rack1"),
         ("172.16.1.3:9042".parse().unwrap(), "rack1"),
-        ("172.16.1.4:9042".parse().unwrap(), "rack1"),
         ("172.16.1.5:9042".parse().unwrap(), "rack2"),
         ("172.16.1.6:9042".parse().unwrap(), "rack2"),
-        ("172.16.1.7:9042".parse().unwrap(), "rack2"),
         ("172.16.1.8:9042".parse().unwrap(), "rack3"),
         ("172.16.1.9:9042".parse().unwrap(), "rack3"),
-        ("172.16.1.10:9042".parse().unwrap(), "rack3"),
     ];
     cluster::multi_rack::test_topology_task(None, expected_nodes, 16).await;
 }

shotover-proxy/tests/test-configs/cassandra/cluster-multi-rack-3-per-rack/docker-compose.yaml → shotover-proxy/tests/test-configs/cassandra/cluster-multi-rack-2-per-rack/docker-compose.yaml

@@ -16,7 +16,7 @@ services:
       cluster_subnet:
         ipv4_address: 172.16.1.2
     environment: &environment
-      CASSANDRA_SEEDS: "cassandra1_1,cassandra1_2,cassandra1_3,cassandra2_1,cassandra2_2,cassandra2_3,cassandra3_1,cassandra3_2,cassandra3_3"
+      CASSANDRA_SEEDS: "cassandra1_1,cassandra1_2,cassandra2_1,cassandra2_2,cassandra3_1,cassandra3_2"
       CASSANDRA_CLUSTER_NAME: TestCluster
       CASSANDRA_RACK: rack1
       CASSANDRA_DC: datacenter1
@@ -36,15 +36,6 @@ services:
       <<: *environment
       CASSANDRA_RACK: rack1
     volumes: *volumes
-  cassandra1_3:
-    image: *image
-    networks:
-      cluster_subnet:
-        ipv4_address: 172.16.1.4
-    environment:
-      <<: *environment
-      CASSANDRA_RACK: rack1
-    volumes: *volumes
 
   cassandra2_1:
     image: *image
@@ -64,15 +55,6 @@ services:
       <<: *environment
       CASSANDRA_RACK: rack2
     volumes: *volumes
-  cassandra2_3:
-    image: *image
-    networks:
-      cluster_subnet:
-        ipv4_address: 172.16.1.7
-    environment:
-      <<: *environment
-      CASSANDRA_RACK: rack2
-    volumes: *volumes
 
   cassandra3_1:
     image: *image
@@ -92,12 +74,3 @@ services:
       <<: *environment
       CASSANDRA_RACK: rack3
     volumes: *volumes
-  cassandra3_3:
-    image: *image
-    networks:
-      cluster_subnet:
-        ipv4_address: 172.16.1.10
-    environment:
-      <<: *environment
-      CASSANDRA_RACK: rack3
-    volumes: *volumes