Merge branch 'cassandra-3.11' into cassandra-4.0

.circleci/config-2_1.yml

@@ -106,6 +106,15 @@ default_env_vars: &default_env_vars
     # The number of times that the manually specified Python dtests should be run.
     REPEATED_DTESTS_COUNT: 500
 
+    # Comma-separated list of Python large dtests that should be repeatedly run, for example:
+    # REPEATED_LARGE_DTESTS: replace_address_test.py
+    # REPEATED_LARGE_DTESTS: replace_address_test.py::TestReplaceAddress
+    # REPEATED_LARGE_DTESTS: replace_address_test.py::TestReplaceAddress::test_replace_stopped_node
+    # REPEATED_LARGE_DTESTS: replace_address_test.py,materialized_views_test.py
+    REPEATED_LARGE_DTESTS:
+    # The number of times that the manually specified Python large dtests should be run.
+    REPEATED_LARGE_DTESTS_COUNT: 100
+
     # Comma-separated list of Python dtests that should be repeatedly run, for example:
     # REPEATED_UPGRADE_DTESTS: upgrade_tests/cql_tests.py
     # REPEATED_UPGRADE_DTESTS: upgrade_tests/cql_tests.py::TestCQLNodes2RF1_Upgrade_current_4_0_x_To_indev_4_0_x
@@ -181,6 +190,12 @@ j11_small_executor: &j11_small_executor
     #exec_resource_class: medium
   parallelism: 1
 
+j11_medium_par_executor: &j11_medium_par_executor
+  executor:
+    name: java11-executor
+    #exec_resource_class: xlarge
+  parallelism: 1
+
 j11_seq_executor: &j11_seq_executor
   executor:
     name: java11-executor
@@ -469,6 +484,31 @@ j8_separate_jobs: &j8_separate_jobs
         requires:
           - start_j8_dtests_offheap_repeat
           - j8_build
+    # Java 8 large DTests
+    - start_j8_dtests_large:
+        type: approval
+    - j8_dtests_large:
+        requires:
+          - start_j8_dtests_large
+          - j8_build
+    - start_j8_dtests_large_repeat:
+        type: approval
+    - j8_dtests_large_repeat:
+        requires:
+          - start_j8_dtests_large_repeat
+          - j8_build
+    - start_j8_dtests_large_vnode:
+        type: approval
+    - j8_dtests_large_vnode:
+        requires:
+          - start_j8_dtests_large_vnode
+          - j8_build
+    - start_j8_dtests_large_vnode_repeat:
+        type: approval
+    - j8_dtests_large_vnode_repeat:
+        requires:
+          - start_j8_dtests_large_vnode_repeat
+          - j8_build
     # Java 11 dtests
     - start_j11_dtests:
         type: approval
@@ -507,6 +547,29 @@ j8_separate_jobs: &j8_separate_jobs
         requires:
           - start_j11_dtests_offheap_repeat
           - j8_build
+    # Java 11 Python large DTests
+    - start_j11_dtests_large:
+        type: approval
+    - j11_dtests_large:
+        requires:
+          - start_j11_dtests_large
+          - j8_build
+    - start_j11_dtests_large_repeat:
+        type: approval
+    - j11_dtests_large_repeat:
+        requires:
+          - start_j11_dtests_large_repeat
+          - j8_build
+    - start_j11_dtests_large_vnode:
+        type: approval
+    - j11_dtests_large_vnode:
+        requires:
+          - start_j11_dtests_large_vnode
+          - j8_build
+    - j11_dtests_large_vnode_repeat:
+        requires:
+          - start_j11_dtests_large_repeat
+          - j8_build
     # Java 8 upgrade tests
     - start_upgrade_tests:
         type: approval
@@ -838,6 +901,44 @@ j8_pre-commit_jobs: &j8_pre-commit_jobs
         requires:
           - start_j11_dtests_offheap
           - j8_build
+    # Java 8 large DTests
+    - start_j8_dtests_large:
+        type: approval
+    - j8_dtests_large:
+        requires:
+          - start_j8_dtests_large
+          - j8_build
+    - j8_dtests_large_repeat:
+        requires:
+          - start_j8_dtests_large
+          - j8_build
+    - j8_dtests_large_vnode:
+        requires:
+          - start_j8_dtests_large
+          - j8_build
+    - j8_dtests_large_vnode_repeat:
+        requires:
+          - start_j8_dtests_large
+          - j8_build
+    # Java 11 large DTests
+    - start_j11_dtests_large:
+        type: approval
+    - j11_dtests_large:
+        requires:
+          - start_j11_dtests_large
+          - j8_build
+    - j11_dtests_large_repeat:
+        requires:
+          - start_j11_dtests_large
+          - j8_build
+    - j11_dtests_large_vnode:
+        requires:
+          - start_j11_dtests_large
+          - j8_build
+    - j11_dtests_large_vnode_repeat:
+        requires:
+          - start_j11_dtests_large
+          - j8_build
     # Java 8 upgrade tests (on request)
     - start_upgrade_tests:
         type: approval
@@ -1065,6 +1166,31 @@ j11_separate_jobs: &j11_separate_jobs
         requires:
           - start_j11_cqlsh-dtests-offheap
           - j11_build
+    # Python large DTests
+    - start_j11_dtests_large:
+        type: approval
+    - j11_dtests_large:
+        requires:
+          - start_j11_dtests_large
+          - j11_build
+    - start_j11_dtests_large_repeat:
+        type: approval
+    - j11_dtests_large_repeat:
+        requires:
+          - start_j11_dtests_large_repeat
+          - j11_build
+    - start_j11_dtests_large_vnode:
+        type: approval
+    - j11_dtests_large_vnode:
+        requires:
+          - start_j11_dtests_large_vnode
+          - j11_build
+    - start_j11_dtests_large_vnode_repeat:
+        type: approval
+    - j11_dtests_large_vnode_repeat:
+        requires:
+          - start_j11_dtests_large_vnode_repeat
+          - j11_build
     # specialized unit tests (all run on request)
     - start_j11_utests_long:
         type: approval
@@ -1240,6 +1366,25 @@ j11_pre-commit_jobs: &j11_pre-commit_jobs
         requires:
           - start_j11_cqlsh-dtests-offheap
           - j11_build
+    # Large Python DTests
+    - start_j11_dtests_large:
+        type: approval
+    - j11_dtests_large:
+        requires:
+          - start_j11_dtests_large
+          - j11_build
+    - j11_dtests_large_repeat:
+        requires:
+          - start_j11_dtests_large
+          - j11_build
+    - j11_dtests_large_vnode:
+        requires:
+          - start_j11_dtests_large
+          - j11_build
+    - j11_dtests_large_vnode_repeat:
+        requires:
+          - start_j11_dtests_large
+          - j11_build
     # specialized unit tests (all run on request)
     - start_utests_long:
         type: approval
@@ -1641,6 +1786,62 @@ jobs:
         file_tag: j11_without_vnodes
         pytest_extra_args: '--skip-resource-intensive-tests'
 
+  j8_dtests_large_vnode:
+    <<: *j8_par_executor
+    steps:
+      - attach_workspace:
+          at: /home/cassandra
+      - clone_dtest
+      - create_venv
+      - create_dtest_containers:
+          file_tag: j8_large_with_vnodes
+          run_dtests_extra_args: '--use-vnodes --only-resource-intensive-tests --force-resource-intensive-tests'
+      - run_dtests:
+          file_tag: j8_large_with_vnodes
+          pytest_extra_args: '--use-vnodes --num-tokens=16 --only-resource-intensive-tests --force-resource-intensive-tests'
+
+  j8_dtests_large:
+    <<: *j8_par_executor
+    steps:
+      - attach_workspace:
+          at: /home/cassandra
+      - clone_dtest
+      - create_venv
+      - create_dtest_containers:
+          file_tag: j8_large_without_vnodes
+          run_dtests_extra_args: '--only-resource-intensive-tests --force-resource-intensive-tests'
+      - run_dtests:
+          file_tag: j8_large_without_vnodes
+          pytest_extra_args: '--num-tokens=16 --only-resource-intensive-tests --force-resource-intensive-tests'
+
+  j11_dtests_large_vnode:
+    <<: *j11_par_executor
+    steps:
+      - attach_workspace:
+          at: /home/cassandra
+      - clone_dtest
+      - create_venv
+      - create_dtest_containers:
+          file_tag: j11_large_with_vnodes
+          run_dtests_extra_args: '--use-vnodes --only-resource-intensive-tests --force-resource-intensive-tests'
+      - run_dtests:
+          file_tag: j11_large_with_vnodes
+          pytest_extra_args: '--use-vnodes --num-tokens=16 --only-resource-intensive-tests --force-resource-intensive-tests'
+
+  j11_dtests_large:
+    <<: *j11_par_executor
+    steps:
+      - attach_workspace:
+          at: /home/cassandra
+      - clone_dtest
+      - create_venv
+      - create_dtest_containers:
+          file_tag: j11_large_without_vnodes
+          run_dtests_extra_args: '--only-resource-intensive-tests --force-resource-intensive-tests'
+      - run_dtests:
+          file_tag: j11_large_without_vnodes
+          pytest_extra_args: '--num-tokens=16 --only-resource-intensive-tests --force-resource-intensive-tests'
+
   j8_upgrade_dtests:
     <<: *j8_par_executor
     steps:
@@ -2171,6 +2372,67 @@ jobs:
       - log_environment
       - run_jvm_dtests_repeat
 
+
+  j8_dtests_large_repeat:
+    <<: *j8_repeated_dtest_executor
+    steps:
+      - attach_workspace:
+          at: /home/cassandra
+      - clone_dtest
+      - create_venv
+      - run_repeated_dtest:
+          tests: ${REPEATED_LARGE_DTESTS}
+          vnodes: "false"
+          upgrade: "false"
+          count: ${REPEATED_LARGE_DTESTS_COUNT}
+          stop_on_failure: ${REPEATED_TESTS_STOP_ON_FAILURE}
+          extra_dtest_args: "--only-resource-intensive-tests --force-resource-intensive-tests"
+
+  j8_dtests_large_vnode_repeat:
+    <<: *j8_repeated_dtest_executor
+    steps:
+      - attach_workspace:
+          at: /home/cassandra
+      - clone_dtest
+      - create_venv
+      - run_repeated_dtest:
+          tests: ${REPEATED_LARGE_DTESTS}
+          vnodes: "true"
+          upgrade: "false"
+          count: ${REPEATED_LARGE_DTESTS_COUNT}
+          stop_on_failure: ${REPEATED_TESTS_STOP_ON_FAILURE}
+          extra_dtest_args: "--only-resource-intensive-tests --force-resource-intensive-tests"
+
+  j11_dtests_large_repeat:
+    <<: *j11_repeated_dtest_executor
+    steps:
+      - attach_workspace:
+          at: /home/cassandra
+      - clone_dtest
+      - create_venv
+      - run_repeated_dtest:
+          tests: ${REPEATED_LARGE_DTESTS}
+          vnodes: "false"
+          upgrade: "false"
+          count: ${REPEATED_LARGE_DTESTS_COUNT}
+          stop_on_failure: ${REPEATED_TESTS_STOP_ON_FAILURE}
+          extra_dtest_args: "--only-resource-intensive-tests --force-resource-intensive-tests"
+
+  j11_dtests_large_vnode_repeat:
+    <<: *j11_repeated_dtest_executor
+    steps:
+      - attach_workspace:
+          at: /home/cassandra
+      - clone_dtest
+      - create_venv
+      - run_repeated_dtest:
+          tests: ${REPEATED_LARGE_DTESTS}
+          vnodes: "true"
+          upgrade: "false"
+          count: ${REPEATED_LARGE_DTESTS_COUNT}
+          stop_on_failure: ${REPEATED_TESTS_STOP_ON_FAILURE}
+          extra_dtest_args: "--only-resource-intensive-tests --force-resource-intensive-tests"
+
   j8_jvm_upgrade_dtests_repeat:
     <<: *j8_repeated_jvm_upgrade_dtest_executor
     steps:
@@ -2650,7 +2912,12 @@ commands:
             mkdir -p /tmp/results/dtests
             # we need the "set -o pipefail" here so that the exit code that circleci will actually use is from pytest and not the exit code from tee
             export SPLIT_TESTS=`cat /tmp/split_dtest_tests_<<parameters.file_tag>>_final.txt`
-            set -o pipefail && cd ~/cassandra-dtest && pytest <<parameters.pytest_extra_args>> --log-cli-level=DEBUG --junit-xml=/tmp/results/dtests/pytest_result_<<parameters.file_tag>>.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $SPLIT_TESTS 2>&1 | tee /tmp/dtest/stdout.txt
+            if [ ! -z "$SPLIT_TESTS" ]; then
+              set -o pipefail && cd ~/cassandra-dtest && pytest <<parameters.pytest_extra_args>> --log-cli-level=DEBUG --junit-xml=/tmp/results/dtests/pytest_result_<<parameters.file_tag>>.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $SPLIT_TESTS 2>&1 | tee /tmp/dtest/stdout.txt
+            else
+              echo "Tune your parallelism, there are more containers than test classes. Nothing to do in this container"
+              (exit 1)
+            fi
       - store_test_results:
           path: /tmp/results
       - store_artifacts:

.circleci/config-2_1.yml.high_res.patch

@@ -1,6 +1,6 @@
---- config-2_1.yml	2022-11-07 21:17:20.000000000 -0500
-+++ config-2_1.yml.HIGHRES	2022-11-07 21:20:40.000000000 -0500
-@@ -136,14 +136,14 @@
+--- config-2_1.yml	2023-02-07 21:00:52.000000000 -0500
++++ config-2_1.yml.HIGHRES	2023-02-07 21:03:37.000000000 -0500
+@@ -145,14 +145,14 @@
  j8_par_executor: &j8_par_executor
    executor:
      name: java8-executor
@@ -19,7 +19,7 @@
  
  j8_small_executor: &j8_small_executor
    executor:
-@@ -154,68 +154,74 @@
+@@ -163,74 +163,80 @@
  j8_medium_par_executor: &j8_medium_par_executor
    executor:
      name: java8-executor
@@ -43,23 +43,29 @@
 +    exec_resource_class: xlarge
 +  parallelism: 100
  
--j11_small_par_executor: &j11_small_par_executor
-+j11_small_executor: &j11_small_executor
+ j11_small_par_executor: &j11_small_par_executor
    executor:
      name: java11-executor
 -    #exec_resource_class: xlarge
-+    exec_resource_class: medium
-   parallelism: 1
- 
--j11_small_executor: &j11_small_executor
-+j11_small_par_executor: &j11_small_par_executor
-   executor:
-     name: java11-executor
--    #exec_resource_class: medium
 -  parallelism: 1
 +    exec_resource_class: xlarge
 +  parallelism: 5
  
+ j11_small_executor: &j11_small_executor
+   executor:
+     name: java11-executor
+-    #exec_resource_class: medium
++    exec_resource_class: medium
+   parallelism: 1
+ 
+ j11_medium_par_executor: &j11_medium_par_executor
+   executor:
+     name: java11-executor
+-    #exec_resource_class: xlarge
+-  parallelism: 1
++    exec_resource_class: xlarge
++  parallelism: 2
+ 
  j11_seq_executor: &j11_seq_executor
    executor:
      name: java11-executor
@@ -111,3 +117,39 @@
  
  j8_separate_jobs: &j8_separate_jobs
    jobs:
+@@ -1787,7 +1793,7 @@
+         pytest_extra_args: '--skip-resource-intensive-tests'
+ 
+   j8_dtests_large_vnode:
+-    <<: *j8_par_executor
++    <<: *j8_seq_executor
+     steps:
+       - attach_workspace:
+           at: /home/cassandra
+@@ -1801,7 +1807,7 @@
+           pytest_extra_args: '--use-vnodes --num-tokens=16 --only-resource-intensive-tests --force-resource-intensive-tests'
+ 
+   j8_dtests_large:
+-    <<: *j8_par_executor
++    <<: *j8_seq_executor
+     steps:
+       - attach_workspace:
+           at: /home/cassandra
+@@ -1815,7 +1821,7 @@
+           pytest_extra_args: '--num-tokens=16 --only-resource-intensive-tests --force-resource-intensive-tests'
+ 
+   j11_dtests_large_vnode:
+-    <<: *j11_par_executor
++    <<: *j11_seq_executor
+     steps:
+       - attach_workspace:
+           at: /home/cassandra
+@@ -1829,7 +1835,7 @@
+           pytest_extra_args: '--use-vnodes --num-tokens=16 --only-resource-intensive-tests --force-resource-intensive-tests'
+ 
+   j11_dtests_large:
+-    <<: *j11_par_executor
++    <<: *j11_seq_executor
+     steps:
+       - attach_workspace:
+           at: /home/cassandra

.circleci/config-2_1.yml.mid_res.patch

@@ -1,6 +1,6 @@
---- config-2_1.yml	2023-01-19 06:38:57.093283218 -0600
-+++ config-2_1.yml.MIDRES	2023-01-13 11:55:08.633040364 -0600
-@@ -136,14 +136,14 @@
+--- config-2_1.yml	2023-02-07 21:22:17.000000000 -0500
++++ config-2_1.yml.MIDRES	2023-02-08 10:15:45.000000000 -0500
+@@ -145,14 +145,14 @@
  j8_par_executor: &j8_par_executor
    executor:
      name: java8-executor
@@ -19,13 +19,13 @@
  
  j8_small_executor: &j8_small_executor
    executor:
-@@ -154,26 +154,38 @@
+@@ -163,26 +163,38 @@
  j8_medium_par_executor: &j8_medium_par_executor
    executor:
      name: java8-executor
 -    #exec_resource_class: xlarge
 -  parallelism: 1
-+    exec_resource_class: large
++    exec_resource_class: xlarge
 +  parallelism: 4
 +
 +j8_large_par_executor: &j8_large_par_executor
@@ -65,16 +65,21 @@
  
  j11_small_executor: &j11_small_executor
    executor:
-@@ -181,41 +193,53 @@
-     #exec_resource_class: medium
-   parallelism: 1
- 
+@@ -193,44 +205,56 @@
+ j11_medium_par_executor: &j11_medium_par_executor
+   executor:
+     name: java11-executor
+-    #exec_resource_class: xlarge
+-  parallelism: 1
++    exec_resource_class: xlarge
++  parallelism: 4
++
 +j11_large_par_executor: &j11_large_par_executor
 +  executor:
 +    name: java11-executor
 +    exec_resource_class: large
 +  parallelism: 50
-+
+ 
  j11_seq_executor: &j11_seq_executor
    executor:
      name: java11-executor
@@ -126,7 +131,7 @@
  
  j8_separate_jobs: &j8_separate_jobs
    jobs:
-@@ -1555,7 +1579,7 @@
+@@ -1700,7 +1724,7 @@
            target: testclasslist-system-keyspace-directory
  
    j8_dtests_vnode:
@@ -135,7 +140,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1569,7 +1593,7 @@
+@@ -1714,7 +1738,7 @@
            pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests'
  
    j8_dtests_offheap:
@@ -144,7 +149,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1583,7 +1607,7 @@
+@@ -1728,7 +1752,7 @@
            pytest_extra_args: '--use-vnodes --num-tokens=16 --use-off-heap-memtables --skip-resource-intensive-tests'
  
    j11_dtests_vnode:
@@ -153,7 +158,7 @@
      steps:
      - attach_workspace:
          at: /home/cassandra
-@@ -1598,7 +1622,7 @@
+@@ -1743,7 +1767,7 @@
          pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests'
  
    j11_dtests_offheap:
@@ -162,7 +167,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1613,7 +1637,7 @@
+@@ -1758,7 +1782,7 @@
            pytest_extra_args: '--use-vnodes --num-tokens=16 --use-off-heap-memtables --skip-resource-intensive-tests'
  
    j8_dtests:
@@ -171,7 +176,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1627,7 +1651,7 @@
+@@ -1772,7 +1796,7 @@
            pytest_extra_args: '--skip-resource-intensive-tests'
  
    j11_dtests:
@@ -180,16 +185,52 @@
      steps:
      - attach_workspace:
          at: /home/cassandra
-@@ -1642,7 +1666,7 @@
+@@ -1787,7 +1811,7 @@
          pytest_extra_args: '--skip-resource-intensive-tests'
  
+   j8_dtests_large_vnode:
+-    <<: *j8_par_executor
++    <<: *j8_medium_par_executor
+     steps:
+       - attach_workspace:
+           at: /home/cassandra
+@@ -1801,7 +1825,7 @@
+           pytest_extra_args: '--use-vnodes --num-tokens=16 --only-resource-intensive-tests --force-resource-intensive-tests'
+ 
+   j8_dtests_large:
+-    <<: *j8_par_executor
++    <<: *j8_medium_par_executor
+     steps:
+       - attach_workspace:
+           at: /home/cassandra
+@@ -1815,7 +1839,7 @@
+           pytest_extra_args: '--num-tokens=16 --only-resource-intensive-tests --force-resource-intensive-tests'
+ 
+   j11_dtests_large_vnode:
+-    <<: *j11_par_executor
++    <<: *j11_medium_par_executor
+     steps:
+       - attach_workspace:
+           at: /home/cassandra
+@@ -1829,7 +1853,7 @@
+           pytest_extra_args: '--use-vnodes --num-tokens=16 --only-resource-intensive-tests --force-resource-intensive-tests'
+ 
+   j11_dtests_large:
+-    <<: *j11_par_executor
++    <<: *j11_medium_par_executor
+     steps:
+       - attach_workspace:
+           at: /home/cassandra
+@@ -1843,7 +1867,7 @@
+           pytest_extra_args: '--num-tokens=16 --only-resource-intensive-tests --force-resource-intensive-tests'
+ 
    j8_upgrade_dtests:
 -    <<: *j8_par_executor
 +    <<: *j8_very_large_par_executor
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1656,7 +1680,7 @@
+@@ -1857,7 +1881,7 @@
            pytest_extra_args: '--execute-upgrade-tests-only --upgrade-target-version-only --upgrade-version-selection all'
  
    j8_cqlsh-dtests-py2-with-vnodes:
@@ -198,7 +239,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1671,7 +1695,7 @@
+@@ -1872,7 +1896,7 @@
            extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
  
    j8_cqlsh-dtests-py2-offheap:
@@ -207,7 +248,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1686,7 +1710,7 @@
+@@ -1887,7 +1911,7 @@
            extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
  
    j8_cqlsh_dtests_py3_vnode:
@@ -216,7 +257,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1701,7 +1725,7 @@
+@@ -1902,7 +1926,7 @@
            extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
  
    j8_cqlsh_dtests_py3_offheap:
@@ -225,7 +266,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1716,7 +1740,7 @@
+@@ -1917,7 +1941,7 @@
            extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
  
    j8_cqlsh_dtests_py38_vnode:
@@ -234,7 +275,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1734,7 +1758,7 @@
+@@ -1935,7 +1959,7 @@
            python_version: '3.8'
  
    j8_cqlsh_dtests_py311_vnode:
@@ -243,7 +284,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1752,7 +1776,7 @@
+@@ -1953,7 +1977,7 @@
            python_version: '3.11'
  
    j8_cqlsh_dtests_py38_offheap:
@@ -252,7 +293,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1770,7 +1794,7 @@
+@@ -1971,7 +1995,7 @@
            python_version: '3.8'
  
    j8_cqlsh_dtests_py311_offheap:
@@ -261,7 +302,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1788,7 +1812,7 @@
+@@ -1989,7 +2013,7 @@
            python_version: '3.11'
  
    j8_cqlsh-dtests-py2-no-vnodes:
@@ -270,7 +311,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1803,7 +1827,7 @@
+@@ -2004,7 +2028,7 @@
            extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
  
    j8_cqlsh_dtests_py3:
@@ -279,7 +320,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1818,7 +1842,7 @@
+@@ -2019,7 +2043,7 @@
            extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
  
    j8_cqlsh_dtests_py38:
@@ -288,7 +329,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1836,7 +1860,7 @@
+@@ -2037,7 +2061,7 @@
            python_version: '3.8'
  
    j8_cqlsh_dtests_py311:
@@ -297,7 +338,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1854,7 +1878,7 @@
+@@ -2055,7 +2079,7 @@
            python_version: '3.11'
  
    j11_cqlsh-dtests-py2-with-vnodes:
@@ -306,7 +347,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1869,7 +1893,7 @@
+@@ -2070,7 +2094,7 @@
            extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
  
    j11_cqlsh-dtests-py2-offheap:
@@ -315,7 +356,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1884,7 +1908,7 @@
+@@ -2085,7 +2109,7 @@
            extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
  
    j11_cqlsh_dtests_py3_vnode:
@@ -324,7 +365,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1899,7 +1923,7 @@
+@@ -2100,7 +2124,7 @@
            extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
  
    j11_cqlsh_dtests_py3_offheap:
@@ -333,7 +374,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1914,7 +1938,7 @@
+@@ -2115,7 +2139,7 @@
            extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
  
    j11_cqlsh_dtests_py38_vnode:
@@ -342,7 +383,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1932,7 +1956,7 @@
+@@ -2133,7 +2157,7 @@
            python_version: '3.8'
  
    j11_cqlsh_dtests_py311_vnode:
@@ -351,7 +392,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1950,7 +1974,7 @@
+@@ -2151,7 +2175,7 @@
            python_version: '3.11'
  
    j11_cqlsh_dtests_py38_offheap:
@@ -360,7 +401,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1968,7 +1992,7 @@
+@@ -2169,7 +2193,7 @@
            python_version: '3.8'
  
    j11_cqlsh_dtests_py311_offheap:
@@ -369,7 +410,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -1986,7 +2010,7 @@
+@@ -2187,7 +2211,7 @@
            python_version: '3.11'
  
    j11_cqlsh-dtests-py2-no-vnodes:
@@ -378,7 +419,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -2001,7 +2025,7 @@
+@@ -2202,7 +2226,7 @@
            extra_env_args: 'CQLSH_PYTHON=/usr/bin/python2.7'
  
    j11_cqlsh_dtests_py3:
@@ -387,7 +428,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -2016,7 +2040,7 @@
+@@ -2217,7 +2241,7 @@
            extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
  
    j11_cqlsh_dtests_py38:
@@ -396,7 +437,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -2034,7 +2058,7 @@
+@@ -2235,7 +2259,7 @@
            python_version: '3.8'
  
    j11_cqlsh_dtests_py311:
@@ -405,7 +446,7 @@
      steps:
        - attach_workspace:
            at: /home/cassandra
-@@ -3069,3 +3093,4 @@
+@@ -3336,3 +3360,4 @@
        - store_artifacts:
            path: ~/cassandra-dtest/logs
            destination: dtest_logs

.circleci/generate.sh

@@ -55,6 +55,8 @@ print_help()
   echo "                   -e REPEATED_JVM_UPGRADE_DTESTS_COUNT=500"
   echo "                   -e REPEATED_DTESTS=cdc_test.py cqlsh_tests/test_cqlsh.py::TestCqlshSmoke"
   echo "                   -e REPEATED_DTESTS_COUNT=500"
+  echo "                   -e REPEATED_LARGE_DTESTS=replace_address_test.py::TestReplaceAddress::test_replace_stopped_node"
+  echo "                   -e REPEATED_LARGE_DTESTS=100"
   echo "                   -e REPEATED_UPGRADE_DTESTS=upgrade_tests/cql_tests.py upgrade_tests/paging_test.py"
   echo "                   -e REPEATED_UPGRADE_DTESTS_COUNT=25"
   echo "                   -e REPEATED_ANT_TEST_TARGET=testsome"
@@ -124,6 +126,8 @@ if $has_env_vars && $check_env_vars; then
        [ "$key" != "REPEATED_JVM_UPGRADE_DTESTS_COUNT" ]  &&
        [ "$key" != "REPEATED_DTESTS" ] &&
        [ "$key" != "REPEATED_DTESTS_COUNT" ] &&
+       [ "$key" != "REPEATED_LARGE_DTESTS" ] &&
+       [ "$key" != "REPEATED_LARGE_DTESTS_COUNT" ] &&
        [ "$key" != "REPEATED_UPGRADE_DTESTS" ] &&
        [ "$key" != "REPEATED_UPGRADE_DTESTS_COUNT" ] &&
        [ "$key" != "REPEATED_ANT_TEST_TARGET" ] &&
@@ -296,6 +300,12 @@ delete_repeated_jobs()
     delete_job "$1" "j11_dtests_vnode_repeat"
     delete_job "$1" "j11_dtests_offheap_repeat"
   fi
+  if (! (echo "$env_vars" | grep -q "REPEATED_LARGE_DTESTS=")); then
+    delete_job "$1" "j8_dtests_large_repeat"
+    delete_job "$1" "j8_dtests_large_vnode_repeat"
+    delete_job "$1" "j11_dtests_large_repeat"
+    delete_job "$1" "j11_dtests_large_vnode_repeat"
+  fi
   if (! (echo "$env_vars" | grep -q "REPEATED_UPGRADE_DTESTS=")); then
     delete_job "$1" "j8_upgrade_dtests_repeat"
   fi

.circleci/readme.md

@@ -78,6 +78,7 @@ generate.sh -m \
   -e REPEATED_JVM_DTESTS_COUNT=500 \
   -e REPEATED_JVM_UPGRADE_DTESTS_COUNT=500 \
   -e REPEATED_DTESTS_COUNT=500 \
+  -e REPEATED_LARGE_DTESTS_COUNT=100 \
   -e REPEATED_UPGRADE_DTESTS_COUNT=25 \
   -e REPEATED_ANT_TEST_COUNT=500
 ```
@@ -94,6 +95,7 @@ generate.sh -m \
   -e REPEATED_UTESTS_LONG=org.apache.cassandra.io.sstable.CQLSSTableWriterLongTest#testWideRow \
   -e REPEATED_UTESTS_STRESS=org.apache.cassandra.stress.generate.DistributionGaussianTest \
   -e REPEATED_DTESTS=cql_test.py,consistency_test.py::TestAvailability::test_simple_strategy \
+  -e REPEATED_LARGE_DTESTS=replace_address_test.py::TestReplaceAddress::test_replace_stopped_node \
   -e REPEATED_JVM_DTESTS=org.apache.cassandra.distributed.test.PagingTest#testPaging \
   -e REPEATED_UPGRADE_DTESTS=upgrade_tests/cql_tests.py \
   -e REPEATED_JVM_UPGRADE_DTESTS=org.apache.cassandra.distributed.upgrade.GroupByTest
@@ -121,6 +123,8 @@ generate.sh -m \
   -e REPEATED_UTESTS_STRESS_COUNT=500 \
   -e REPEATED_DTESTS=cql_test.py,consistency_test.py::TestAvailability::test_simple_strategy \
   -e REPEATED_DTESTS_COUNT=500 \
+  -e REPEATED_LARGE_DTESTS=replace_address_test.py,materialized_views_test.py \
+  -e REPEATED_LARGE_DTESTS_COUNT=100 \
   -e REPEATED_JVM_DTESTS=org.apache.cassandra.distributed.test.PagingTest#testPaging \
   -e REPEATED_JVM_DTESTS_COUNT=500 \
   -e REPEATED_UPGRADE_DTESTS=upgrade_tests/cql_tests.py \
@@ -133,6 +137,10 @@ generate.sh -m \
   -e REPEATED_ANT_TEST_COUNT=500
 ```
 
+WARNING: The Python large DTests test_network_topology_strategy and test_network_topology_strategy_each_quorum require
+XLarge containers in order to be run in a loop. Otherwise, you would see NO HOST AVAILABLE if you run them with the 
+default medium config and Large containers.
+
 ## Updating the config
 For configuration changes meant to be permanent in the Apache repo you should never edit
 the `config.yml` file manually. Instead, you should edit the `config-2_1.yml` file and then