From ae53be5f4312175744d45ab04dfea317e41c345b Mon Sep 17 00:00:00 2001 From: Shailaja Koppu Date: Thu, 9 Apr 2026 13:07:33 +0100 Subject: [PATCH] Fix circle CI pipelines OOM --- .circleci/config.yml | 18 +++++++++--------- .../driver/SidecarLoadBalancingPolicyTest.java | 2 ++ .../BasicMultiDCSingleReplicatedTest.java | 2 ++ .../routes/tokenrange/BasicRf3Test.java | 2 ++ .../tokenrange/JoiningTestSingleNode.java | 2 ++ .../sidecar/routes/tokenrange/MovingTest.java | 2 ++ .../routes/tokenrange/ReplacementTest.java | 2 ++ 7 files changed, 21 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2589c3101..de3b92d95 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -119,8 +119,8 @@ jobs: docker: - image: cimg/openjdk:11.0 environment: - INTEGRATION_MAX_PARALLEL_FORKS: 3 - INTEGRATION_MAX_HEAP_SIZE: "2500M" + INTEGRATION_MAX_PARALLEL_FORKS: 2 + INTEGRATION_MAX_HEAP_SIZE: "2000M" resource_class: large steps: - install_common @@ -128,7 +128,7 @@ jobs: - attach_workspace: at: dtest-jars - run: ./scripts/install-shaded-dtest-jar-local.sh - - run: ./gradlew --no-daemon -PdtestVersion=4.0.16 -Dcassandra.sidecar.versions_to_test="4.0" checkstyleIntegrationTest integrationTestLightWeight --stacktrace + - run: ./gradlew --no-daemon --max-workers=2 -PdtestVersion=4.0.16 -Dcassandra.sidecar.versions_to_test="4.0" checkstyleIntegrationTest integrationTestLightWeight --stacktrace - store_artifacts: path: build/reports @@ -174,8 +174,8 @@ jobs: docker: - image: cimg/openjdk:11.0 environment: - INTEGRATION_MAX_PARALLEL_FORKS: 3 - INTEGRATION_MAX_HEAP_SIZE: "2500M" + INTEGRATION_MAX_PARALLEL_FORKS: 2 + INTEGRATION_MAX_HEAP_SIZE: "2000M" resource_class: large steps: - install_common @@ -183,7 +183,7 @@ jobs: - attach_workspace: at: dtest-jars - run: ./scripts/install-shaded-dtest-jar-local.sh - - run: ./gradlew --no-daemon -PdtestVersion=5.0.3 -Dcassandra.sidecar.versions_to_test="5.0" checkstyleIntegrationTest integrationTestLightWeight --stacktrace + - run: ./gradlew --no-daemon --max-workers=2 -PdtestVersion=5.0.3 -Dcassandra.sidecar.versions_to_test="5.0" checkstyleIntegrationTest integrationTestLightWeight --stacktrace - store_artifacts: path: build/reports @@ -229,8 +229,8 @@ jobs: docker: - image: cimg/openjdk:11.0 environment: - INTEGRATION_MAX_PARALLEL_FORKS: 3 - INTEGRATION_MAX_HEAP_SIZE: "2500M" + INTEGRATION_MAX_PARALLEL_FORKS: 2 + INTEGRATION_MAX_HEAP_SIZE: "2000M" resource_class: large steps: - install_common @@ -238,7 +238,7 @@ jobs: - attach_workspace: at: dtest-jars - run: ./scripts/install-shaded-dtest-jar-local.sh - - run: ./gradlew --no-daemon -PdtestVersion=5.1 -Dcassandra.sidecar.versions_to_test="5.1" checkstyleIntegrationTest integrationTestLightWeight --stacktrace + - run: ./gradlew --no-daemon --max-workers=2 -PdtestVersion=5.1 -Dcassandra.sidecar.versions_to_test="5.1" checkstyleIntegrationTest integrationTestLightWeight --stacktrace - store_artifacts: path: build/reports diff --git a/server/src/test/integration/org/apache/cassandra/sidecar/cluster/driver/SidecarLoadBalancingPolicyTest.java b/server/src/test/integration/org/apache/cassandra/sidecar/cluster/driver/SidecarLoadBalancingPolicyTest.java index 5bf7b9856..aa36339f5 100644 --- a/server/src/test/integration/org/apache/cassandra/sidecar/cluster/driver/SidecarLoadBalancingPolicyTest.java +++ b/server/src/test/integration/org/apache/cassandra/sidecar/cluster/driver/SidecarLoadBalancingPolicyTest.java @@ -28,6 +28,7 @@ import com.google.common.util.concurrent.Uninterruptibles; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Tag; import com.datastax.driver.core.DriverUtils; import com.datastax.driver.core.Host; @@ -42,6 +43,7 @@ /** * A test for the SidecarLoadBalancingPolicy */ +@Tag("heavy") public class SidecarLoadBalancingPolicyTest extends IntegrationTestBase { diff --git a/server/src/test/integration/org/apache/cassandra/sidecar/routes/tokenrange/BasicMultiDCSingleReplicatedTest.java b/server/src/test/integration/org/apache/cassandra/sidecar/routes/tokenrange/BasicMultiDCSingleReplicatedTest.java index f60df00e6..f3352754e 100644 --- a/server/src/test/integration/org/apache/cassandra/sidecar/routes/tokenrange/BasicMultiDCSingleReplicatedTest.java +++ b/server/src/test/integration/org/apache/cassandra/sidecar/routes/tokenrange/BasicMultiDCSingleReplicatedTest.java @@ -21,6 +21,7 @@ import java.util.Collections; import com.google.common.collect.ImmutableMap; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.extension.ExtendWith; import io.vertx.junit5.VertxExtension; @@ -34,6 +35,7 @@ * Note: Some related test classes are broken down to have a single test case to parallelize test execution and * therefore limit the instance size required to run the tests from CircleCI as the in-jvm-dtests tests are memory bound */ +@Tag("heavy") @ExtendWith(VertxExtension.class) class BasicMultiDCSingleReplicatedTest extends BaseTokenRangeIntegrationTest { diff --git a/server/src/test/integration/org/apache/cassandra/sidecar/routes/tokenrange/BasicRf3Test.java b/server/src/test/integration/org/apache/cassandra/sidecar/routes/tokenrange/BasicRf3Test.java index 2e668996b..7193dd3a9 100644 --- a/server/src/test/integration/org/apache/cassandra/sidecar/routes/tokenrange/BasicRf3Test.java +++ b/server/src/test/integration/org/apache/cassandra/sidecar/routes/tokenrange/BasicRf3Test.java @@ -21,6 +21,7 @@ import java.util.Collections; import com.google.common.collect.ImmutableMap; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.extension.ExtendWith; import io.vertx.junit5.VertxExtension; @@ -34,6 +35,7 @@ * Note: Some related test classes are broken down to have a single test case to parallelize test execution and * therefore limit the instance size required to run the tests from CircleCI as the in-jvm-dtests tests are memory bound */ +@Tag("heavy") @ExtendWith(VertxExtension.class) class BasicRf3Test extends BaseTokenRangeIntegrationTest { diff --git a/server/src/test/integration/org/apache/cassandra/sidecar/routes/tokenrange/JoiningTestSingleNode.java b/server/src/test/integration/org/apache/cassandra/sidecar/routes/tokenrange/JoiningTestSingleNode.java index 1e574287c..de2b813b1 100644 --- a/server/src/test/integration/org/apache/cassandra/sidecar/routes/tokenrange/JoiningTestSingleNode.java +++ b/server/src/test/integration/org/apache/cassandra/sidecar/routes/tokenrange/JoiningTestSingleNode.java @@ -25,6 +25,7 @@ import java.util.Map; import com.google.common.collect.Range; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.extension.ExtendWith; import io.vertx.junit5.VertxExtension; @@ -40,6 +41,7 @@ * Note: Some related test classes are broken down to have a single test case to parallelize test execution and * therefore limit the instance size required to run the tests from CircleCI as the in-jvm-dtests tests are memory bound */ +@Tag("heavy") @ExtendWith(VertxExtension.class) public class JoiningTestSingleNode extends JoiningBaseTest { diff --git a/server/src/test/integration/org/apache/cassandra/sidecar/routes/tokenrange/MovingTest.java b/server/src/test/integration/org/apache/cassandra/sidecar/routes/tokenrange/MovingTest.java index 997212c3d..4b31cb900 100644 --- a/server/src/test/integration/org/apache/cassandra/sidecar/routes/tokenrange/MovingTest.java +++ b/server/src/test/integration/org/apache/cassandra/sidecar/routes/tokenrange/MovingTest.java @@ -25,6 +25,7 @@ import java.util.Map; import com.google.common.collect.Range; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.extension.ExtendWith; import io.vertx.junit5.VertxExtension; @@ -40,6 +41,7 @@ /** * Node movement scenarios integration tests for token range replica mapping endpoint with the in-jvm dtest framework. */ +@Tag("heavy") @ExtendWith(VertxExtension.class) public class MovingTest extends MovingBaseTest { diff --git a/server/src/test/integration/org/apache/cassandra/sidecar/routes/tokenrange/ReplacementTest.java b/server/src/test/integration/org/apache/cassandra/sidecar/routes/tokenrange/ReplacementTest.java index 7c636d277..93b61ae20 100644 --- a/server/src/test/integration/org/apache/cassandra/sidecar/routes/tokenrange/ReplacementTest.java +++ b/server/src/test/integration/org/apache/cassandra/sidecar/routes/tokenrange/ReplacementTest.java @@ -30,6 +30,7 @@ import java.util.function.BiConsumer; import com.google.common.collect.Range; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.extension.ExtendWith; import io.vertx.junit5.VertxExtension; @@ -46,6 +47,7 @@ /** * Host replacement scenario integration tests for token range replica mapping endpoint with the in-jvm dtest framework. */ +@Tag("heavy") @ExtendWith(VertxExtension.class) class ReplacementTest extends ReplacementBaseTest {