diff --git a/.circleci/config-2_1.yml b/.circleci/config-2_1.yml index c76334e0e6..c983bf5be2 100644 --- a/.circleci/config-2_1.yml +++ b/.circleci/config-2_1.yml @@ -115,10 +115,10 @@ default_env_vars: &default_env_vars REPEATED_DTESTS_COUNT: 500 # Comma-separated list of Python large dtests that should be repeatedly run, for example: - # REPEATED_LARGE_DTESTS: consistency_test.py - # REPEATED_LARGE_DTESTS: consistency_test.py::TestAvailability - # REPEATED_LARGE_DTESTS: consistency_test.py::TestAvailability::test_network_topology_strategy - # REPEATED_LARGE_DTESTS: consistency_test.py,materialized_views_test.py + # 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 @@ -1042,23 +1042,17 @@ j8_pre-commit_jobs: &j8_pre-commit_jobs requires: - start_j8_dtests_large - j8_build - - start_j8_dtests_large_repeat: - type: approval - j8_dtests_large_repeat: requires: - - start_j8_dtests_large_repeat + - start_j8_dtests_large - j8_build - - start_j8_dtests_large_vnode: - type: approval - j8_dtests_large_vnode: requires: - - start_j8_dtests_large_vnode + - start_j8_dtests_large - j8_build - - start_j8_dtests_large_vnode_repeat: - type: approval - j8_dtests_large_vnode_repeat: requires: - - start_j8_dtests_large_vnode_repeat + - start_j8_dtests_large - j8_build - start_j11_dtests_large: type: approval @@ -1066,23 +1060,17 @@ j8_pre-commit_jobs: &j8_pre-commit_jobs requires: - start_j11_dtests_large - j8_build - - start_j11_dtests_large_repeat: - type: approval - j11_dtests_large_repeat: requires: - - start_j11_dtests_large_repeat + - start_j11_dtests_large - j8_build - - start_j11_dtests_large_vnode: - type: approval - j11_dtests_large_vnode: requires: - - start_j11_dtests_large_vnode + - start_j11_dtests_large - j8_build - - start_j11_dtests_large_vnode_repeat: - type: approval - j11_dtests_large_vnode_repeat: requires: - - start_j11_dtests_large_vnode_repeat + - start_j11_dtests_large - j8_build # Java 8 upgrade tests (on request) - start_upgrade_dtests: @@ -1494,23 +1482,17 @@ j11_pre-commit_jobs: &j11_pre-commit_jobs requires: - start_j11_dtests_large - j11_build - - start_j11_dtests_large_repeat: - type: approval - j11_dtests_large_repeat: requires: - - start_j11_dtests_large_repeat + - start_j11_dtests_large - j11_build - - start_j11_dtests_large_vnode: - type: approval - j11_dtests_large_vnode: requires: - - start_j11_dtests_large_vnode + - start_j11_dtests_large - j11_build - - start_j11_dtests_large_vnode_repeat: - type: approval - j11_dtests_large_vnode_repeat: requires: - - start_j11_dtests_large_vnode_repeat + - start_j11_dtests_large - j11_build - j11_cqlsh_dtests_py3: requires: diff --git a/.circleci/config-2_1.yml.high_res.patch b/.circleci/config-2_1.yml.high_res.patch index 7d9c3e639e..85f69c7578 100644 --- a/.circleci/config-2_1.yml.high_res.patch +++ b/.circleci/config-2_1.yml.high_res.patch @@ -1,5 +1,5 @@ ---- config-2_1.yml 2022-12-08 12:05:10.056741273 -0600 -+++ config-2_1.yml.HIGHRES 2022-12-08 12:14:31.612411783 -0600 +--- config-2_1.yml 2023-02-02 21:26:13.000000000 -0500 ++++ config-2_1.yml.HIGHRES 2023-02-02 21:27:02.000000000 -0500 @@ -158,14 +158,14 @@ j8_par_executor: &j8_par_executor executor: @@ -111,7 +111,7 @@ j8_separate_jobs: &j8_separate_jobs jobs: -@@ -2329,7 +2335,7 @@ +@@ -2338,7 +2344,7 @@ python_version: '3.11' j8_dtests_large_vnode: @@ -120,7 +120,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2343,7 +2349,7 @@ +@@ -2352,7 +2358,7 @@ pytest_extra_args: '--use-vnodes --num-tokens=16 --only-resource-intensive-tests --force-resource-intensive-tests' j8_dtests_large: @@ -129,7 +129,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2357,7 +2363,7 @@ +@@ -2366,7 +2372,7 @@ pytest_extra_args: '--only-resource-intensive-tests --force-resource-intensive-tests' j11_dtests_large_vnode: @@ -138,7 +138,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2371,7 +2377,7 @@ +@@ -2380,7 +2386,7 @@ pytest_extra_args: '--use-vnodes --num-tokens=16 --only-resource-intensive-tests --force-resource-intensive-tests' j11_dtests_large: diff --git a/.circleci/config-2_1.yml.mid_res.patch b/.circleci/config-2_1.yml.mid_res.patch index c326d566ae..f5c890c15e 100644 --- a/.circleci/config-2_1.yml.mid_res.patch +++ b/.circleci/config-2_1.yml.mid_res.patch @@ -1,5 +1,5 @@ ---- config-2_1.yml 2023-01-19 11:05:52.546896275 -0600 -+++ config-2_1.yml.MIDRES 2023-01-19 11:08:59.816172429 -0600 +--- config-2_1.yml 2023-02-02 21:26:13.000000000 -0500 ++++ config-2_1.yml.MIDRES 2023-02-02 21:27:09.000000000 -0500 @@ -158,14 +158,14 @@ j8_par_executor: &j8_par_executor executor: @@ -40,7 +40,7 @@ name: java8-executor - #exec_resource_class: xlarge - parallelism: 1 -+ exec_resource_class: large ++ exec_resource_class: xlarge + parallelism: 4 j8_seq_executor: &j8_seq_executor @@ -74,7 +74,7 @@ name: java11-executor - #exec_resource_class: xlarge - parallelism: 1 -+ exec_resource_class: large ++ exec_resource_class: xlarge + parallelism: 4 + +j11_large_par_executor: &j11_large_par_executor @@ -134,7 +134,7 @@ j8_separate_jobs: &j8_separate_jobs jobs: -@@ -1949,7 +1973,7 @@ +@@ -1931,7 +1955,7 @@ target: testclasslist-system-keyspace-directory j8_dtests_vnode: @@ -143,7 +143,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -1963,7 +1987,7 @@ +@@ -1945,7 +1969,7 @@ pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests' j8_dtests_offheap: @@ -152,7 +152,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -1977,7 +2001,7 @@ +@@ -1959,7 +1983,7 @@ pytest_extra_args: '--use-vnodes --num-tokens=16 --use-off-heap-memtables --skip-resource-intensive-tests' j11_dtests_vnode: @@ -161,7 +161,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -1992,7 +2016,7 @@ +@@ -1974,7 +1998,7 @@ pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests' j11_dtests_offheap: @@ -170,7 +170,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2007,7 +2031,7 @@ +@@ -1989,7 +2013,7 @@ pytest_extra_args: '--use-vnodes --num-tokens=16 --use-off-heap-memtables --skip-resource-intensive-tests' j8_dtests: @@ -179,7 +179,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2021,7 +2045,7 @@ +@@ -2003,7 +2027,7 @@ pytest_extra_args: '--skip-resource-intensive-tests' j11_dtests: @@ -188,7 +188,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2036,7 +2060,7 @@ +@@ -2018,7 +2042,7 @@ pytest_extra_args: '--skip-resource-intensive-tests' j8_upgrade_dtests: @@ -197,7 +197,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2050,7 +2074,7 @@ +@@ -2032,7 +2056,7 @@ pytest_extra_args: '--execute-upgrade-tests-only --upgrade-target-version-only --upgrade-version-selection all' j8_cqlsh_dtests_py3_vnode: @@ -206,7 +206,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2065,7 +2089,7 @@ +@@ -2047,7 +2071,7 @@ extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6' j8_cqlsh_dtests_py3_offheap: @@ -215,7 +215,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2080,7 +2104,7 @@ +@@ -2062,7 +2086,7 @@ extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6' j8_cqlsh_dtests_py38_vnode: @@ -224,7 +224,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2098,7 +2122,7 @@ +@@ -2080,7 +2104,7 @@ python_version: '3.8' j8_cqlsh_dtests_py311_vnode: @@ -233,7 +233,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2116,7 +2140,7 @@ +@@ -2098,7 +2122,7 @@ python_version: '3.11' j8_cqlsh_dtests_py38_offheap: @@ -242,7 +242,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2134,7 +2158,7 @@ +@@ -2116,7 +2140,7 @@ python_version: '3.8' j8_cqlsh_dtests_py311_offheap: @@ -251,7 +251,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2152,7 +2176,7 @@ +@@ -2134,7 +2158,7 @@ python_version: '3.11' j8_cqlsh_dtests_py3: @@ -260,7 +260,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2167,7 +2191,7 @@ +@@ -2149,7 +2173,7 @@ extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6' j8_cqlsh_dtests_py38: @@ -269,7 +269,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2185,7 +2209,7 @@ +@@ -2167,7 +2191,7 @@ python_version: '3.8' j8_cqlsh_dtests_py311: @@ -278,7 +278,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2203,7 +2227,7 @@ +@@ -2185,7 +2209,7 @@ python_version: '3.11' j11_cqlsh_dtests_py3_vnode: @@ -287,7 +287,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2218,7 +2242,7 @@ +@@ -2200,7 +2224,7 @@ extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6' j11_cqlsh_dtests_py3_offheap: @@ -296,7 +296,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2233,7 +2257,7 @@ +@@ -2215,7 +2239,7 @@ extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6' j11_cqlsh_dtests_py38_vnode: @@ -305,7 +305,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2251,7 +2275,7 @@ +@@ -2233,7 +2257,7 @@ python_version: '3.8' j11_cqlsh_dtests_py311_vnode: @@ -314,7 +314,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2269,7 +2293,7 @@ +@@ -2251,7 +2275,7 @@ python_version: '3.11' j11_cqlsh_dtests_py38_offheap: @@ -323,7 +323,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2287,7 +2311,7 @@ +@@ -2269,7 +2293,7 @@ python_version: '3.8' j11_cqlsh_dtests_py311_offheap: @@ -332,7 +332,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2305,7 +2329,7 @@ +@@ -2287,7 +2311,7 @@ python_version: '3.11' j11_cqlsh_dtests_py3: @@ -341,7 +341,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2320,7 +2344,7 @@ +@@ -2302,7 +2326,7 @@ extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6' j11_cqlsh_dtests_py38: @@ -350,7 +350,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2338,7 +2362,7 @@ +@@ -2320,7 +2344,7 @@ python_version: '3.8' j11_cqlsh_dtests_py311: @@ -359,7 +359,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2356,7 +2380,7 @@ +@@ -2338,7 +2362,7 @@ python_version: '3.11' j8_dtests_large_vnode: @@ -368,7 +368,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2370,7 +2394,7 @@ +@@ -2352,7 +2376,7 @@ pytest_extra_args: '--use-vnodes --num-tokens=16 --only-resource-intensive-tests --force-resource-intensive-tests' j8_dtests_large: @@ -377,7 +377,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2384,7 +2408,7 @@ +@@ -2366,7 +2390,7 @@ pytest_extra_args: '--only-resource-intensive-tests --force-resource-intensive-tests' j11_dtests_large_vnode: @@ -386,7 +386,7 @@ steps: - attach_workspace: at: /home/cassandra -@@ -2398,7 +2422,7 @@ +@@ -2380,7 +2404,7 @@ pytest_extra_args: '--use-vnodes --num-tokens=16 --only-resource-intensive-tests --force-resource-intensive-tests' j11_dtests_large: diff --git a/.circleci/config.yml b/.circleci/config.yml index de2705869e..bb41b759fc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10555,11 +10555,9 @@ workflows: requires: - start_j8_dtests_large - j8_build - - start_j8_dtests_large_vnode: - type: approval - j8_dtests_large_vnode: requires: - - start_j8_dtests_large_vnode + - start_j8_dtests_large - j8_build - start_j11_dtests_large: type: approval @@ -10567,11 +10565,9 @@ workflows: requires: - start_j11_dtests_large - j8_build - - start_j11_dtests_large_vnode: - type: approval - j11_dtests_large_vnode: requires: - - start_j11_dtests_large_vnode + - start_j11_dtests_large - j8_build - start_upgrade_dtests: type: approval @@ -10841,11 +10837,9 @@ workflows: requires: - start_j11_dtests_large - j11_build - - start_j11_dtests_large_vnode: - type: approval - j11_dtests_large_vnode: requires: - - start_j11_dtests_large_vnode + - start_j11_dtests_large - j11_build - j11_cqlsh_dtests_py3: requires: diff --git a/.circleci/config.yml.HIGHRES b/.circleci/config.yml.HIGHRES index bc8431bccb..626a9e3efe 100644 --- a/.circleci/config.yml.HIGHRES +++ b/.circleci/config.yml.HIGHRES @@ -10555,11 +10555,9 @@ workflows: requires: - start_j8_dtests_large - j8_build - - start_j8_dtests_large_vnode: - type: approval - j8_dtests_large_vnode: requires: - - start_j8_dtests_large_vnode + - start_j8_dtests_large - j8_build - start_j11_dtests_large: type: approval @@ -10567,11 +10565,9 @@ workflows: requires: - start_j11_dtests_large - j8_build - - start_j11_dtests_large_vnode: - type: approval - j11_dtests_large_vnode: requires: - - start_j11_dtests_large_vnode + - start_j11_dtests_large - j8_build - start_upgrade_dtests: type: approval @@ -10841,11 +10837,9 @@ workflows: requires: - start_j11_dtests_large - j11_build - - start_j11_dtests_large_vnode: - type: approval - j11_dtests_large_vnode: requires: - - start_j11_dtests_large_vnode + - start_j11_dtests_large - j11_build - j11_cqlsh_dtests_py3: requires: diff --git a/.circleci/config.yml.LOWRES b/.circleci/config.yml.LOWRES index de2705869e..bb41b759fc 100644 --- a/.circleci/config.yml.LOWRES +++ b/.circleci/config.yml.LOWRES @@ -10555,11 +10555,9 @@ workflows: requires: - start_j8_dtests_large - j8_build - - start_j8_dtests_large_vnode: - type: approval - j8_dtests_large_vnode: requires: - - start_j8_dtests_large_vnode + - start_j8_dtests_large - j8_build - start_j11_dtests_large: type: approval @@ -10567,11 +10565,9 @@ workflows: requires: - start_j11_dtests_large - j8_build - - start_j11_dtests_large_vnode: - type: approval - j11_dtests_large_vnode: requires: - - start_j11_dtests_large_vnode + - start_j11_dtests_large - j8_build - start_upgrade_dtests: type: approval @@ -10841,11 +10837,9 @@ workflows: requires: - start_j11_dtests_large - j11_build - - start_j11_dtests_large_vnode: - type: approval - j11_dtests_large_vnode: requires: - - start_j11_dtests_large_vnode + - start_j11_dtests_large - j11_build - j11_cqlsh_dtests_py3: requires: diff --git a/.circleci/config.yml.MIDRES b/.circleci/config.yml.MIDRES index 8f1d9df795..b2790f5e89 100644 --- a/.circleci/config.yml.MIDRES +++ b/.circleci/config.yml.MIDRES @@ -21,7 +21,7 @@ jobs: j8_jvm_upgrade_dtests: docker: - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest - resource_class: large + resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l parallelism: 4 @@ -565,7 +565,7 @@ jobs: j8_dtests_large_vnode: docker: - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest - resource_class: large + resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l parallelism: 4 @@ -1978,7 +1978,7 @@ jobs: j11_dtests_large_vnode: docker: - image: apache/cassandra-testing-ubuntu2004-java11:latest - resource_class: large + resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l parallelism: 4 @@ -2421,7 +2421,7 @@ jobs: j11_dtests_large: docker: - image: apache/cassandra-testing-ubuntu2004-java11:latest - resource_class: large + resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l parallelism: 4 @@ -4121,7 +4121,7 @@ jobs: j8_dtests_large: docker: - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest - resource_class: large + resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l parallelism: 4 @@ -10105,12 +10105,6 @@ workflows: requires: - start_j8_unit_tests - j8_build - - start_j8_unit_tests_repeat: - type: approval - - j8_unit_tests_repeat: - requires: - - start_j8_unit_tests_repeat - - j8_build - start_j8_jvm_dtests: type: approval - j8_jvm_dtests: @@ -10123,18 +10117,6 @@ workflows: requires: - start_j8_jvm_dtests_vnode - j8_build - - start_j8_jvm_dtests_repeat: - type: approval - - j8_jvm_dtests_repeat: - requires: - - start_j8_jvm_dtests_repeat - - j8_build - - start_j8_jvm_dtests_vnode_repeat: - type: approval - - j8_jvm_dtests_vnode_repeat: - requires: - - start_j8_jvm_dtests_vnode_repeat - - j8_build - start_j11_jvm_dtests: type: approval - j11_jvm_dtests: @@ -10147,30 +10129,12 @@ workflows: requires: - start_j11_jvm_dtests_vnode - j8_build - - start_j11_jvm_dtests_repeat: - type: approval - - j11_jvm_dtests_repeat: - requires: - - start_j11_jvm_dtests_repeat - - j8_build - - start_j11_jvm_dtests_vnode_repeat: - type: approval - - j11_jvm_dtests_vnode_repeat: - requires: - - start_j11_jvm_dtests_vnode_repeat - - j8_build - start_j8_simulator_dtests: type: approval - j8_simulator_dtests: requires: - start_j8_simulator_dtests - j8_build - - start_j8_simulator_dtests_repeat: - type: approval - - j8_simulator_dtests_repeat: - requires: - - start_j8_simulator_dtests_repeat - - j8_build - start_j8_cqlshlib_tests: type: approval - j8_cqlshlib_tests: @@ -10201,12 +10165,6 @@ workflows: requires: - start_j11_unit_tests - j8_build - - start_j11_unit_tests_repeat: - type: approval - - j11_unit_tests_repeat: - requires: - - start_j11_unit_tests_repeat - - j8_build - start_j8_utests_long: type: approval - j8_utests_long: @@ -10219,18 +10177,6 @@ workflows: requires: - start_j11_utests_long - j8_build - - start_j8_utests_long_repeat: - type: approval - - j8_utests_long_repeat: - requires: - - start_j8_utests_long_repeat - - j8_build - - start_j11_utests_long_repeat: - type: approval - - j11_utests_long_repeat: - requires: - - start_j11_utests_long_repeat - - j8_build - start_j8_utests_cdc: type: approval - j8_utests_cdc: @@ -10243,18 +10189,6 @@ workflows: requires: - start_j11_utests_cdc - j8_build - - start_j8_utests_cdc_repeat: - type: approval - - j8_utests_cdc_repeat: - requires: - - start_j8_utests_cdc_repeat - - j8_build - - start_j11_utests_cdc_repeat: - type: approval - - j11_utests_cdc_repeat: - requires: - - start_j11_utests_cdc_repeat - - j8_build - start_j8_utests_compression: type: approval - j8_utests_compression: @@ -10267,18 +10201,6 @@ workflows: requires: - start_j11_utests_compression - j8_build - - start_j8_utests_compression_repeat: - type: approval - - j8_utests_compression_repeat: - requires: - - start_j8_utests_compression_repeat - - j8_build - - start_j11_utests_compression_repeat: - type: approval - - j11_utests_compression_repeat: - requires: - - start_j11_utests_compression_repeat - - j8_build - start_j8_utests_trie: type: approval - j8_utests_trie: @@ -10291,18 +10213,6 @@ workflows: requires: - start_j11_utests_trie - j8_build - - start_j8_utests_trie_repeat: - type: approval - - j8_utests_trie_repeat: - requires: - - start_j8_utests_trie_repeat - - j8_build - - start_j11_utests_trie_repeat: - type: approval - - j11_utests_trie_repeat: - requires: - - start_j11_utests_trie_repeat - - j8_build - start_j8_utests_stress: type: approval - j8_utests_stress: @@ -10315,18 +10225,6 @@ workflows: requires: - start_j11_utests_stress - j8_build - - start_j8_utests_stress_repeat: - type: approval - - j8_utests_stress_repeat: - requires: - - start_j8_utests_stress_repeat - - j8_build - - start_j11_utests_stress_repeat: - type: approval - - j11_utests_stress_repeat: - requires: - - start_j11_utests_stress_repeat - - j8_build - start_j8_utests_fqltool: type: approval - j8_utests_fqltool: @@ -10339,18 +10237,6 @@ workflows: requires: - start_j11_utests_fqltool - j8_build - - start_j8_utests_fqltool_repeat: - type: approval - - j8_utests_fqltool_repeat: - requires: - - start_j8_utests_fqltool_repeat - - j8_build - - start_j11_utests_fqltool_repeat: - type: approval - - j11_utests_fqltool_repeat: - requires: - - start_j11_utests_fqltool_repeat - - j8_build - start_j8_utests_system_keyspace_directory: type: approval - j8_utests_system_keyspace_directory: @@ -10363,18 +10249,6 @@ workflows: requires: - start_j11_utests_system_keyspace_directory - j8_build - - start_j8_utests_system_keyspace_directory_repeat: - type: approval - - j8_utests_system_keyspace_directory_repeat: - requires: - - start_j8_utests_system_keyspace_directory_repeat - - j8_build - - start_j11_utests_system_keyspace_directory_repeat: - type: approval - - j11_utests_system_keyspace_directory_repeat: - requires: - - start_j11_utests_system_keyspace_directory_repeat - - j8_build - start_j8_dtest_jars_build: type: approval - j8_dtest_jars_build: @@ -10387,12 +10261,6 @@ workflows: requires: - start_jvm_upgrade_dtests - j8_dtest_jars_build - - start_jvm_upgrade_dtests_repeat: - type: approval - - j8_jvm_upgrade_dtests_repeat: - requires: - - start_jvm_upgrade_dtests_repeat - - j8_dtest_jars_build - start_j8_dtests: type: approval - j8_dtests: @@ -10411,12 +10279,6 @@ workflows: requires: - start_j8_dtests_offheap - j8_build - - start_j8_dtests_offheap_repeat: - type: approval - - j8_dtests_offheap_repeat: - requires: - - start_j8_dtests_offheap_repeat - - j8_build - start_j11_dtests: type: approval - j11_dtests: @@ -10435,60 +10297,30 @@ workflows: requires: - start_j11_dtests_offheap - j8_build - - start_j11_dtests_offheap_repeat: - type: approval - - j11_dtests_offheap_repeat: - requires: - - start_j11_dtests_offheap_repeat - - j8_build - 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 - 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 - - start_j11_dtests_large_vnode_repeat: - type: approval - - j11_dtests_large_vnode_repeat: - requires: - - start_j11_dtests_large_vnode_repeat - - j8_build - start_upgrade_dtests: type: approval - j8_upgrade_dtests: @@ -10575,48 +10407,6 @@ workflows: requires: - start_j11_cqlsh_tests_offheap - j8_build - - start_j8_repeated_ant_test: - type: approval - - j8_repeated_ant_test: - requires: - - start_j8_repeated_ant_test - - j8_build - - start_j11_repeated_ant_test: - type: approval - - j11_repeated_ant_test: - requires: - - start_j11_repeated_ant_test - - j8_build - - start_j8_dtests_repeat: - type: approval - - j8_dtests_repeat: - requires: - - start_j8_dtests_repeat - - j8_build - - start_j8_dtests_vnode_repeat: - type: approval - - j8_dtests_vnode_repeat: - requires: - - start_j8_dtests_vnode_repeat - - j8_build - - start_j11_dtests_repeat: - type: approval - - j11_dtests_repeat: - requires: - - start_j11_dtests_repeat - - j8_build - - start_j11_dtests_vnode_repeat: - type: approval - - j11_dtests_vnode_repeat: - requires: - - start_j11_dtests_vnode_repeat - - j8_build - - start_j8_upgrade_dtests_repeat: - type: approval - - j8_upgrade_dtests_repeat: - requires: - - start_j8_upgrade_dtests_repeat - - j8_build java8_pre-commit_tests: jobs: - start_pre-commit_tests: @@ -10627,39 +10417,21 @@ workflows: - j8_unit_tests: requires: - j8_build - - j8_unit_tests_repeat: - requires: - - j8_build - j8_simulator_dtests: requires: - j8_build - - j8_simulator_dtests_repeat: - requires: - - j8_build - j8_jvm_dtests: requires: - j8_build - - j8_jvm_dtests_repeat: - requires: - - j8_build - j8_jvm_dtests_vnode: requires: - j8_build - - j8_jvm_dtests_vnode_repeat: - requires: - - j8_build - j11_jvm_dtests: requires: - j8_build - - j11_jvm_dtests_repeat: - requires: - - j8_build - j11_jvm_dtests_vnode: requires: - j8_build - - j11_jvm_dtests_vnode_repeat: - requires: - - j8_build - j8_cqlshlib_tests: requires: - j8_build @@ -10675,9 +10447,6 @@ workflows: - j11_unit_tests: requires: - j8_build - - j11_unit_tests_repeat: - requires: - - j8_build - start_utests_long: type: approval - j8_utests_long: @@ -10688,14 +10457,6 @@ workflows: requires: - start_utests_long - j8_build - - j8_utests_long_repeat: - requires: - - start_utests_long - - j8_build - - j11_utests_long_repeat: - requires: - - start_utests_long - - j8_build - start_utests_cdc: type: approval - j8_utests_cdc: @@ -10706,14 +10467,6 @@ workflows: requires: - start_utests_cdc - j8_build - - j8_utests_cdc_repeat: - requires: - - start_utests_cdc - - j8_build - - j11_utests_cdc_repeat: - requires: - - start_utests_cdc - - j8_build - start_utests_compression: type: approval - j8_utests_compression: @@ -10724,14 +10477,6 @@ workflows: requires: - start_utests_compression - j8_build - - j8_utests_compression_repeat: - requires: - - start_utests_compression - - j8_build - - j11_utests_compression_repeat: - requires: - - start_utests_compression - - j8_build - start_utests_trie: type: approval - j8_utests_trie: @@ -10742,14 +10487,6 @@ workflows: requires: - start_utests_trie - j8_build - - j8_utests_trie_repeat: - requires: - - start_utests_trie - - j8_build - - j11_utests_trie_repeat: - requires: - - start_utests_trie - - j8_build - start_utests_stress: type: approval - j8_utests_stress: @@ -10760,14 +10497,6 @@ workflows: requires: - start_utests_stress - j8_build - - j8_utests_stress_repeat: - requires: - - start_utests_stress - - j8_build - - j11_utests_stress_repeat: - requires: - - start_utests_stress - - j8_build - start_utests_fqltool: type: approval - j8_utests_fqltool: @@ -10778,14 +10507,6 @@ workflows: requires: - start_utests_fqltool - j8_build - - j8_utests_fqltool_repeat: - requires: - - start_utests_fqltool - - j8_build - - j11_utests_fqltool_repeat: - requires: - - start_utests_fqltool - - j8_build - start_utests_system_keyspace_directory: type: approval - j8_utests_system_keyspace_directory: @@ -10795,13 +10516,6 @@ workflows: requires: - start_utests_system_keyspace_directory - j8_build - - j8_utests_system_keyspace_directory_repeat: - requires: - - j8_build - - j11_utests_system_keyspace_directory_repeat: - requires: - - start_utests_system_keyspace_directory - - j8_build - start_jvm_upgrade_dtests: type: approval - j8_dtest_jars_build: @@ -10811,76 +10525,39 @@ workflows: - j8_jvm_upgrade_dtests: requires: - j8_dtest_jars_build - - j8_jvm_upgrade_dtests_repeat: - requires: - - j8_dtest_jars_build - j8_dtests: requires: - j8_build - - j8_dtests_repeat: - requires: - - j8_build - j8_dtests_vnode: requires: - j8_build - - j8_dtests_vnode_repeat: - requires: - - j8_build - start_j8_dtests_offheap: type: approval - j8_dtests_offheap: requires: - start_j8_dtests_offheap - j8_build - - j8_dtests_offheap_repeat: - requires: - - start_j8_dtests_offheap - - j8_build - j11_dtests: requires: - j8_build - - j11_dtests_repeat: - requires: - - j8_build - j11_dtests_vnode: requires: - j8_build - - j11_dtests_vnode_repeat: - requires: - - j8_build - start_j11_dtests_offheap: type: approval - j11_dtests_offheap: requires: - start_j11_dtests_offheap - j8_build - - j11_dtests_offheap_repeat: - requires: - - start_j11_dtests_offheap - - j8_build - 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 + - start_j8_dtests_large - j8_build - start_j11_dtests_large: type: approval @@ -10888,23 +10565,9 @@ workflows: 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 - - start_j11_dtests_large_vnode_repeat: - type: approval - - j11_dtests_large_vnode_repeat: - requires: - - start_j11_dtests_large_vnode_repeat + - start_j11_dtests_large - j8_build - start_upgrade_dtests: type: approval @@ -10912,10 +10575,6 @@ workflows: requires: - j8_build - start_upgrade_dtests - - j8_upgrade_dtests_repeat: - requires: - - j8_build - - start_upgrade_dtests - j8_cqlsh_dtests_py3: requires: - j8_build @@ -10993,12 +10652,6 @@ workflows: requires: - start_j11_unit_tests - j11_build - - start_j11_unit_tests_repeat: - type: approval - - j11_unit_tests_repeat: - requires: - - start_j11_unit_tests_repeat - - j11_build - start_j11_jvm_dtests: type: approval - j11_jvm_dtests: @@ -11011,30 +10664,12 @@ workflows: requires: - start_j11_jvm_dtests_vnode - j11_build - - start_j11_jvm_dtests_repeat: - type: approval - - j11_jvm_dtests_repeat: - requires: - - start_j11_jvm_dtests_repeat - - j11_build - - start_j11_jvm_dtests_vnode_repeat: - type: approval - - j11_jvm_dtests_vnode_repeat: - requires: - - start_j11_jvm_dtests_vnode_repeat - - j11_build - start_j11_simulator_dtests: type: approval - j11_simulator_dtests: requires: - start_j11_simulator_dtests - j11_build - - start_j11_simulator_dtests_repeat: - type: approval - - j11_simulator_dtests_repeat: - requires: - - start_j11_simulator_dtests_repeat - - j11_build - start_j11_cqlshlib_tests: type: approval - j11_cqlshlib_tests: @@ -11065,36 +10700,18 @@ workflows: requires: - start_j11_dtests_offheap - j11_build - - start_j11_dtests_offheap_repeat: - type: approval - - j11_dtests_offheap_repeat: - requires: - - start_j11_dtests_offheap_repeat - - j11_build - 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 - start_j11_cqlsh_tests: type: approval - j11_cqlsh_dtests_py3: @@ -11141,102 +10758,42 @@ workflows: requires: - start_j11_utests_long - j11_build - - start_j11_utests_long_repeat: - type: approval - - j11_utests_long_repeat: - requires: - - start_j11_utests_long_repeat - - j11_build - start_j11_utests_cdc: type: approval - j11_utests_cdc: requires: - start_j11_utests_cdc - j11_build - - start_j11_utests_cdc_repeat: - type: approval - - j11_utests_cdc_repeat: - requires: - - start_j11_utests_cdc_repeat - - j11_build - start_j11_utests_compression: type: approval - j11_utests_compression: requires: - start_j11_utests_compression - j11_build - - start_j11_utests_compression_repeat: - type: approval - - j11_utests_compression_repeat: - requires: - - start_j11_utests_compression_repeat - - j11_build - start_j11_utests_trie: type: approval - j11_utests_trie: requires: - start_j11_utests_trie - j11_build - - start_j11_utests_trie_repeat: - type: approval - - j11_utests_trie_repeat: - requires: - - start_j11_utests_trie_repeat - - j11_build - start_j11_utests_stress: type: approval - j11_utests_stress: requires: - start_j11_utests_stress - j11_build - - start_j11_utests_stress_repeat: - type: approval - - j11_utests_stress_repeat: - requires: - - start_j11_utests_stress_repeat - - j11_build - start_j11_utests_fqltool: type: approval - j11_utests_fqltool: requires: - start_j11_utests_fqltool - j11_build - - start_j11_utests_fqltool_repeat: - type: approval - - j11_utests_fqltool_repeat: - requires: - - start_j11_utests_fqltool_repeat - - j11_build - start_j11_utests_system_keyspace_directory: type: approval - j11_utests_system_keyspace_directory: requires: - start_j11_utests_system_keyspace_directory - j11_build - - start_j11_utests_system_keyspace_directory_repeat: - type: approval - - j11_utests_system_keyspace_directory_repeat: - requires: - - start_j11_utests_system_keyspace_directory_repeat - - j11_build - - start_j11_repeated_ant_test: - type: approval - - j11_repeated_ant_test: - requires: - - start_j11_repeated_ant_test - - j11_build - - start_j11_dtests_repeat: - type: approval - - j11_dtests_repeat: - requires: - - start_j11_dtests_repeat - - j11_build - - start_j11_dtests_vnode_repeat: - type: approval - - j11_dtests_vnode_repeat: - requires: - - start_j11_dtests_vnode_repeat - - j11_build java11_pre-commit_tests: jobs: - start_pre-commit_tests: @@ -11247,27 +10804,15 @@ workflows: - j11_unit_tests: requires: - j11_build - - j11_unit_tests_repeat: - requires: - - j11_build - j11_jvm_dtests: requires: - j11_build - - j11_jvm_dtests_repeat: - requires: - - j11_build - j11_jvm_dtests_vnode: requires: - j11_build - - j11_jvm_dtests_vnode_repeat: - requires: - - j11_build - j11_simulator_dtests: requires: - j11_build - - j11_simulator_dtests_repeat: - requires: - - j11_build - j11_cqlshlib_tests: requires: - j11_build @@ -11277,50 +10822,24 @@ workflows: - j11_dtests: requires: - j11_build - - j11_dtests_repeat: - requires: - - j11_build - j11_dtests_vnode: requires: - j11_build - - j11_dtests_vnode_repeat: - requires: - - j11_build - start_j11_dtests_offheap: type: approval - j11_dtests_offheap: requires: - start_j11_dtests_offheap - j11_build - - start_j11_dtests_offheap_repeat: - type: approval - - j11_dtests_offheap_repeat: - requires: - - start_j11_dtests_offheap_repeat - - j11_build - 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 + - start_j11_dtests_large - j11_build - j11_cqlsh_dtests_py3: requires: @@ -11360,67 +10879,39 @@ workflows: requires: - start_utests_long - j11_build - - j11_utests_long_repeat: - requires: - - start_utests_long - - j11_build - start_utests_cdc: type: approval - j11_utests_cdc: requires: - start_utests_cdc - j11_build - - j11_utests_cdc_repeat: - requires: - - start_utests_cdc - - j11_build - start_utests_compression: type: approval - j11_utests_compression: requires: - start_utests_compression - j11_build - - j11_utests_compression_repeat: - requires: - - start_utests_compression - - j11_build - start_utests_trie: type: approval - j11_utests_trie: requires: - start_utests_trie - j11_build - - j11_utests_trie_repeat: - requires: - - start_utests_trie - - j11_build - start_utests_stress: type: approval - j11_utests_stress: requires: - start_utests_stress - j11_build - - j11_utests_stress_repeat: - requires: - - start_utests_stress - - j11_build - start_utests_fqltool: type: approval - j11_utests_fqltool: requires: - start_utests_fqltool - j11_build - - j11_utests_fqltool_repeat: - requires: - - start_utests_fqltool - - j11_build - start_utests_system_keyspace_directory: type: approval - j11_utests_system_keyspace_directory: requires: - start_utests_system_keyspace_directory - j11_build - - j11_utests_system_keyspace_directory_repeat: - requires: - - start_utests_system_keyspace_directory - - j11_build diff --git a/.circleci/generate.sh b/.circleci/generate.sh index ad81a824d5..89df9faff4 100755 --- a/.circleci/generate.sh +++ b/.circleci/generate.sh @@ -57,7 +57,7 @@ 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=consistency_test.py::TestAvailability::test_network_topology_strategy" + 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" diff --git a/.circleci/readme.md b/.circleci/readme.md index 2e3f55e9cb..d7c70e5bca 100644 --- a/.circleci/readme.md +++ b/.circleci/readme.md @@ -96,7 +96,7 @@ generate.sh -m \ -e REPEATED_UTESTS_STRESS=org.apache.cassandra.stress.generate.DistributionGaussianTest \ -e REPEATED_SIMULATOR_DTESTS=org.apache.cassandra.simulator.test.TrivialSimulationTest \ -e REPEATED_DTESTS=cql_test.py,consistency_test.py::TestAvailability::test_simple_strategy \ - -e REPEATED_LARGE_DTESTS=consistency_test.py::TestAvailability::test_network_topology_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 @@ -127,8 +127,8 @@ generate.sh -m \ -e REPEATED_SIMULATOR_DTESTS_COUNT=500 \ -e REPEATED_DTESTS=cql_test.py,consistency_test.py::TestAvailability::test_simple_strategy \ -e REPEATED_DTESTS_COUNT=500 \ - -e REPEATED_LARGE_DTESTS=consistency_test.py,materialized_views_test.py \ - -e REPEATED_LARGE_DTESTS=100 \ + -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 \ @@ -142,6 +142,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