Fix intermittent CI failure by downscaling test

shotover · Jan 9, 2024 · cf1f8bb · cf1f8bb
1 parent df6e283
commit cf1f8bb
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 32 deletions.
diff --git a/shotover-proxy/tests/cassandra_int_tests/mod.rs b/shotover-proxy/tests/cassandra_int_tests/mod.rs
@@ -305,10 +305,11 @@ async fn cluster_multi_rack_1_per_rack(#[case] driver: CassandraDriver) {
 }
 
 // This is very slow, only test with one driver
+// TODO: it would be a lot nicer to run with 3 per rack, but github actions struggles with 3, so reduce to 2 until they improve their machines.
 #[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",
     );
@@ -354,13 +355,13 @@ 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.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.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"),
+        //("172.16.1.10:9042".parse().unwrap(), "rack3"),
     ];
     cluster::multi_rack::test_topology_task(None, expected_nodes, 16).await;
 }

diff --git a/...over-proxy/tests/test-configs/cassandra/cluster-multi-rack-3-per-rack/docker-compose.yaml b/...over-proxy/tests/test-configs/cassandra/cluster-multi-rack-3-per-rack/docker-compose.yaml
@@ -16,7 +16,8 @@ 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_SEEDS: "cassandra1_1,cassandra1_2,cassandra1_3,cassandra2_1,cassandra2_2,cassandra2_3,cassandra3_1,cassandra3_2,cassandra3_3"
       CASSANDRA_CLUSTER_NAME: TestCluster
       CASSANDRA_RACK: rack1
       CASSANDRA_DC: datacenter1
@@ -36,15 +37,15 @@ 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
+  # 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 +65,15 @@ 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
+  # 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 +93,12 @@ 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
+  # cassandra3_3:
+  #   image: *image
+  #   networks:
+  #     cluster_subnet:
+  #       ipv4_address: 172.16.1.10
+  #   environment:
+  #     <<: *environment
+  #     CASSANDRA_RACK: rack3
+  #   volumes: *volumes