natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-4.0' into cassandra-4.1

This commit is contained in:
Ekaterina Dimitrova 2022-11-10 12:34:07 -05:00
parent 9fe9b04d85 2b3d0d32a7
commit 98f11efe44
8 changed files with 4220 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

264
.circleci/config-2_1.yml
View File

@ -480,6 +480,19 @@ j8_separate_jobs: &j8_separate_jobs
requires:
- start_j8_dtests_vnode
- j8_build
# Java 8 off-heap dtests
- start_j8_dtests_offheap:
type: approval
- j8_dtests_offheap:
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
# Java 11 dtests
- start_j11_dtests:
type: approval
@ -493,6 +506,19 @@ j8_separate_jobs: &j8_separate_jobs
requires:
- start_j11_dtests_vnode
- j8_build
# Java 11 off-heap dtests
- start_j11_dtests_offheap:
type: approval
- j11_dtests_offheap:
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
# Java 8 upgrade tests
- start_upgrade_dtests:
type: approval
@ -519,6 +545,17 @@ j8_separate_jobs: &j8_separate_jobs
requires:
- start_j8_cqlsh_tests
- j8_build
# Java 8 cqlsh offheap dtests offheap
- start_j8_cqlsh_tests_offheap:
type: approval
- j8_cqlsh_dtests_py3_offheap:
requires:
- start_j8_cqlsh_tests_offheap
- j8_build
- j8_cqlsh_dtests_py38_offheap:
requires:
- start_j8_cqlsh_tests_offheap
- j8_build
# Java 11 cqlsh dtests
- start_j11_cqlsh_tests:
type: approval
@ -538,6 +575,17 @@ j8_separate_jobs: &j8_separate_jobs
requires:
- start_j11_cqlsh_tests
- j8_build
# Java 11 cqlsh dtests off-heap
- start_j11_cqlsh_tests_offheap:
type: approval
- j11_cqlsh_dtests_py3_offheap:
requires:
- start_j11_cqlsh_tests_offheap
- j8_build
- j11_cqlsh_dtests_py38_offheap:
requires:
- start_j11_cqlsh_tests_offheap
- j8_build
# Java 8 repeated utest
- start_j8_repeated_ant_test:
type: approval
@ -760,6 +808,16 @@ j8_pre-commit_jobs: &j8_pre-commit_jobs
- 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
# Java 11 dtests
- j11_dtests:
requires:
@ -773,6 +831,16 @@ j8_pre-commit_jobs: &j8_pre-commit_jobs
- 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
# Java 8 upgrade tests (on request)
- start_upgrade_dtests:
type: approval
@ -797,6 +865,17 @@ j8_pre-commit_jobs: &j8_pre-commit_jobs
- j8_cqlsh_dtests_py38_vnode:
requires:
- j8_build
# Java 8 cqlsh dtests offheap
- start_j8_cqlsh_dtests_offheap:
type: approval
- j8_cqlsh_dtests_py3_offheap:
requires:
- start_j8_cqlsh_dtests_offheap
- j8_build
- j8_cqlsh_dtests_py38_offheap:
requires:
- start_j8_cqlsh_dtests_offheap
- j8_build
# Java 11 cqlsh dtests
- j11_cqlsh_dtests_py3:
requires:
@ -810,6 +889,17 @@ j8_pre-commit_jobs: &j8_pre-commit_jobs
- j11_cqlsh_dtests_py38_vnode:
requires:
- j8_build
# Java 11 cqlsh dtests off-heap
- start_j11_cqlsh-dtests-offheap:
type: approval
- j11_cqlsh_dtests_py3_offheap:
requires:
- start_j11_cqlsh-dtests-offheap
- j8_build
- j11_cqlsh_dtests_py38_offheap:
requires:
- start_j11_cqlsh-dtests-offheap
- j8_build
j11_separate_jobs: &j11_separate_jobs
jobs:
@ -874,6 +964,18 @@ j11_separate_jobs: &j11_separate_jobs
requires:
- start_j11_dtests_vnode
- 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_cqlsh_tests:
type: approval
- j11_cqlsh_dtests_py3:
@ -892,6 +994,16 @@ j11_separate_jobs: &j11_separate_jobs
requires:
- start_j11_cqlsh_tests
- j11_build
- start_j11_cqlsh-dtests-offheap:
type: approval
- j11_cqlsh_dtests_py3_offheap:
requires:
- start_j11_cqlsh-dtests-offheap
- j11_build
- j11_cqlsh_dtests_py38_offheap:
requires:
- start_j11_cqlsh-dtests-offheap
- j11_build
# specialized unit tests (all run on request)
- start_j11_utests_long:
type: approval
@ -1029,6 +1141,18 @@ j11_pre-commit_jobs: &j11_pre-commit_jobs
- 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
- j11_cqlsh_dtests_py3:
requires:
- j11_build
@ -1041,6 +1165,16 @@ j11_pre-commit_jobs: &j11_pre-commit_jobs
- j11_cqlsh_dtests_py38_vnode:
requires:
- j11_build
- start_j11_cqlsh-dtests-offheap:
type: approval
- j11_cqlsh_dtests_py3_offheap:
requires:
- start_j11_cqlsh-dtests-offheap
- j11_build
- j11_cqlsh_dtests_py38_offheap:
requires:
- start_j11_cqlsh-dtests-offheap
- j11_build
# specialized unit tests (all run on request)
- start_utests_long:
type: approval
@ -1406,6 +1540,20 @@ jobs:
file_tag: j8_with_vnodes
pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests'
j8_dtests_offheap:
<<: *j8_par_executor
steps:
- attach_workspace:
at: /home/cassandra
- clone_dtest
- create_venv
- create_dtest_containers:
file_tag: j8_dtests_offheap
run_dtests_extra_args: "--use-vnodes --use-off-heap-memtables --skip-resource-intensive-tests --pytest-options '-k not cql'"
- run_dtests:
file_tag: j8_dtests_offheap
pytest_extra_args: '--use-vnodes --num-tokens=16 --use-off-heap-memtables --skip-resource-intensive-tests'
j11_dtests_vnode:
<<: *j11_par_executor
steps:
@ -1421,6 +1569,21 @@ jobs:
file_tag: j11_with_vnodes
pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests'
j11_dtests_offheap:
<<: *j11_par_executor
steps:
- attach_workspace:
at: /home/cassandra
- log_environment
- clone_dtest
- create_venv
- create_dtest_containers:
file_tag: j11_dtests_offheap
run_dtests_extra_args: "--use-vnodes --use-off-heap-memtables --skip-resource-intensive-tests --pytest-options '-k not cql'"
- run_dtests:
file_tag: j11_dtests_offheap
pytest_extra_args: '--use-vnodes --num-tokens=16 --use-off-heap-memtables --skip-resource-intensive-tests'
j8_dtests:
<<: *j8_par_executor
steps:
@ -1479,6 +1642,21 @@ jobs:
pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests'
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
j8_cqlsh_dtests_py3_offheap:
<<: *j8_par_executor
steps:
- attach_workspace:
at: /home/cassandra
- clone_dtest
- create_venv
- create_dtest_containers:
file_tag: j8_dtests_offheap
run_dtests_extra_args: "--use-vnodes --use-off-heap-memtables --skip-resource-intensive-tests --pytest-options '-k cql'"
- run_dtests:
file_tag: j8_dtests_offheap
pytest_extra_args: '--use-vnodes --num-tokens=16 --use-off-heap-memtables --skip-resource-intensive-tests'
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
j8_cqlsh_dtests_py38_vnode:
<<: *j8_par_executor
steps:
@ -1497,6 +1675,24 @@ jobs:
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.8'
python_version: '3.8'
j8_cqlsh_dtests_py38_offheap:
<<: *j8_par_executor
steps:
- attach_workspace:
at: /home/cassandra
- clone_dtest
- create_venv:
python_version: '3.8'
- create_dtest_containers:
file_tag: j8_dtests_offheap
run_dtests_extra_args: "--use-vnodes --use-off-heap-memtables --skip-resource-intensive-tests --pytest-options '-k cql'"
python_version: '3.8'
- run_dtests:
file_tag: j8_dtests_offheap
pytest_extra_args: '--use-vnodes --num-tokens=16 --use-off-heap-memtables --skip-resource-intensive-tests'
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.8'
python_version: '3.8'
j8_cqlsh_dtests_py3:
<<: *j8_par_executor
steps:
@ -1545,6 +1741,21 @@ jobs:
pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests'
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
j11_cqlsh_dtests_py3_offheap:
<<: *j11_par_executor
steps:
- attach_workspace:
at: /home/cassandra
- clone_dtest
- create_venv
- create_dtest_containers:
file_tag: j11_dtests_offheap
run_dtests_extra_args: "--use-vnodes --use-off-heap-memtables --skip-resource-intensive-tests --pytest-options '-k cql'"
- run_dtests:
file_tag: j11_dtests_offheap
pytest_extra_args: '--use-vnodes --num-tokens=16 --use-off-heap-memtables --skip-resource-intensive-tests'
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
j11_cqlsh_dtests_py38_vnode:
<<: *j11_par_executor
steps:
@ -1563,6 +1774,24 @@ jobs:
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.8'
python_version: '3.8'
j11_cqlsh_dtests_py38_offheap:
<<: *j11_par_executor
steps:
- attach_workspace:
at: /home/cassandra
- clone_dtest
- create_venv:
python_version: '3.8'
- create_dtest_containers:
file_tag: j11_dtests_offheap
run_dtests_extra_args: "--use-vnodes --use-off-heap-memtables --skip-resource-intensive-tests --pytest-options '-k cql'"
python_version: '3.8'
- run_dtests:
file_tag: j11_dtests_offheap
pytest_extra_args: '--use-vnodes --num-tokens=16 --use-off-heap-memtables --skip-resource-intensive-tests'
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.8'
python_version: '3.8'
j11_cqlsh_dtests_py3:
<<: *j11_par_executor
steps:
@ -1812,6 +2041,21 @@ jobs:
count: ${REPEATED_DTESTS_COUNT}
stop_on_failure: ${REPEATED_TESTS_STOP_ON_FAILURE}
j8_dtests_offheap_repeat:
<<: *j8_repeated_dtest_executor
steps:
- attach_workspace:
at: /home/cassandra
- clone_dtest
- create_venv
- run_repeated_dtest:
tests: ${REPEATED_DTESTS}
vnodes: "true"
upgrade: "false"
count: ${REPEATED_DTESTS_COUNT}
stop_on_failure: ${REPEATED_TESTS_STOP_ON_FAILURE}
extra_dtest_args: "--use-off-heap-memtables --skip-resource-intensive-tests"
j11_dtests_repeat:
<<: *j11_repeated_dtest_executor
steps:
@ -1842,6 +2086,21 @@ jobs:
count: ${REPEATED_DTESTS_COUNT}
stop_on_failure: ${REPEATED_TESTS_STOP_ON_FAILURE}
j11_dtests_offheap_repeat:
<<: *j11_repeated_dtest_executor
steps:
- attach_workspace:
at: /home/cassandra
- clone_dtest
- create_venv
- run_repeated_dtest:
tests: ${REPEATED_DTESTS}
vnodes: "true"
upgrade: "false"
count: ${REPEATED_DTESTS_COUNT}
stop_on_failure: ${REPEATED_TESTS_STOP_ON_FAILURE}
extra_dtest_args: "--use-off-heap-memtables --skip-resource-intensive-tests"
j8_upgrade_dtests_repeat:
<<: *j8_repeated_upgrade_dtest_executor
steps:
@ -2611,6 +2870,9 @@ commands:
type: string
stop_on_failure:
type: string
extra_dtest_args:
type: string
default: ""
steps:
- run:
name: Run repeated Python dtest
@ -2665,7 +2927,7 @@ commands:
fi
# 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
set -o pipefail && cd ~/cassandra-dtest && pytest $vnodes_args --count=$count $stop_on_failure_arg $upgrade_arg --log-cli-level=DEBUG --junit-xml=/tmp/results/dtests/pytest_result.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir $tests_arg | tee /tmp/dtest/stdout.txt
set -o pipefail && cd ~/cassandra-dtest && pytest $vnodes_args --count=$count $stop_on_failure_arg $upgrade_arg --log-cli-level=DEBUG --junit-xml=/tmp/results/dtests/pytest_result.xml -s --cassandra-dir=/home/cassandra/cassandra --keep-test-dir <<parameters.extra_dtest_args>> $tests_arg | tee /tmp/dtest/stdout.txt
fi
fi
- store_test_results:

4
.circleci/config-2_1.yml.high_res.patch
View File

@ -1,5 +1,5 @@
--- config-2_1.yml 2022-10-25 12:28:18.966893212 +0100
+++ config-2_1.yml.HIGHRES 2022-10-25 12:29:12.625678547 +0100
--- config-2_1.yml 2022-11-07 22:46:12.000000000 -0500
+++ config-2_1.yml.HIGHRES 2022-11-07 22:55:05.000000000 -0500
@@ -148,14 +148,14 @@
j8_par_executor: &j8_par_executor
executor:

84
.circleci/config-2_1.yml.mid_res.patch
View File

@ -1,5 +1,5 @@
--- config-2_1.yml 2022-10-25 12:28:18.966893212 +0100
+++ config-2_1.yml.MIDRES 2022-10-25 12:29:12.619201467 +0100
--- config-2_1.yml 2022-11-08 17:14:23.000000000 -0500
+++ config-2_1.yml.MIDRES 2022-11-08 17:39:30.000000000 -0500
@@ -148,14 +148,14 @@
j8_par_executor: &j8_par_executor
executor:
@ -129,7 +129,7 @@
j8_separate_jobs: &j8_separate_jobs
jobs:
@@ -1393,7 +1417,7 @@
@@ -1527,7 +1551,7 @@
target: testclasslist-system-keyspace-directory
j8_dtests_vnode:
@ -138,25 +138,43 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -1407,7 +1431,7 @@
@@ -1541,7 +1565,7 @@
pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests'
j8_dtests_offheap:
- <<: *j8_par_executor
+ <<: *j8_large_par_executor
steps:
- attach_workspace:
at: /home/cassandra
@@ -1555,7 +1579,7 @@
pytest_extra_args: '--use-vnodes --num-tokens=16 --use-off-heap-memtables --skip-resource-intensive-tests'
j11_dtests_vnode:
- <<: *j11_par_executor
+ <<: *j11_large_par_executor
steps:
- attach_workspace:
at: /home/cassandra
@@ -1422,7 +1446,7 @@
@@ -1570,7 +1594,7 @@
pytest_extra_args: '--use-vnodes --num-tokens=16 --skip-resource-intensive-tests'
j11_dtests_offheap:
- <<: *j11_par_executor
+ <<: *j11_large_par_executor
steps:
- attach_workspace:
at: /home/cassandra
@@ -1585,7 +1609,7 @@
pytest_extra_args: '--use-vnodes --num-tokens=16 --use-off-heap-memtables --skip-resource-intensive-tests'
j8_dtests:
- <<: *j8_par_executor
+ <<: *j8_large_par_executor
steps:
- attach_workspace:
at: /home/cassandra
@@ -1436,7 +1460,7 @@
@@ -1599,7 +1623,7 @@
pytest_extra_args: '--skip-resource-intensive-tests'
j11_dtests:
@ -165,7 +183,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -1451,7 +1475,7 @@
@@ -1614,7 +1638,7 @@
pytest_extra_args: '--skip-resource-intensive-tests'
j8_upgrade_dtests:
@ -174,7 +192,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -1465,7 +1489,7 @@
@@ -1628,7 +1652,7 @@
pytest_extra_args: '--execute-upgrade-tests-only --upgrade-target-version-only --upgrade-version-selection all'
j8_cqlsh_dtests_py3_vnode:
@ -183,7 +201,16 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -1480,7 +1504,7 @@
@@ -1643,7 +1667,7 @@
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
j8_cqlsh_dtests_py3_offheap:
- <<: *j8_par_executor
+ <<: *j8_large_par_executor
steps:
- attach_workspace:
at: /home/cassandra
@@ -1658,7 +1682,7 @@
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
j8_cqlsh_dtests_py38_vnode:
@ -192,7 +219,16 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -1498,7 +1522,7 @@
@@ -1676,7 +1700,7 @@
python_version: '3.8'
j8_cqlsh_dtests_py38_offheap:
- <<: *j8_par_executor
+ <<: *j8_large_par_executor
steps:
- attach_workspace:
at: /home/cassandra
@@ -1694,7 +1718,7 @@
python_version: '3.8'
j8_cqlsh_dtests_py3:
@ -201,7 +237,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -1513,7 +1537,7 @@
@@ -1709,7 +1733,7 @@
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
j8_cqlsh_dtests_py38:
@ -210,7 +246,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -1531,7 +1555,7 @@
@@ -1727,7 +1751,7 @@
python_version: '3.8'
j11_cqlsh_dtests_py3_vnode:
@ -219,7 +255,16 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -1546,7 +1570,7 @@
@@ -1742,7 +1766,7 @@
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
j11_cqlsh_dtests_py3_offheap:
- <<: *j11_par_executor
+ <<: *j11_large_par_executor
steps:
- attach_workspace:
at: /home/cassandra
@@ -1757,7 +1781,7 @@
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
j11_cqlsh_dtests_py38_vnode:
@ -228,7 +273,16 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -1564,7 +1588,7 @@
@@ -1775,7 +1799,7 @@
python_version: '3.8'
j11_cqlsh_dtests_py38_offheap:
- <<: *j11_par_executor
+ <<: *j11_large_par_executor
steps:
- attach_workspace:
at: /home/cassandra
@@ -1793,7 +1817,7 @@
python_version: '3.8'
j11_cqlsh_dtests_py3:
@ -237,7 +291,7 @@
steps:
- attach_workspace:
at: /home/cassandra
@@ -1579,7 +1603,7 @@
@@ -1808,7 +1832,7 @@
extra_env_args: 'CQLSH_PYTHON=/usr/bin/python3.6'
j11_cqlsh_dtests_py38:

976
.circleci/config.yml
View File

File diff suppressed because it is too large Load Diff

976
.circleci/config.yml.HIGHRES
View File

File diff suppressed because it is too large Load Diff

976
.circleci/config.yml.LOWRES
View File

File diff suppressed because it is too large Load Diff

976
.circleci/config.yml.MIDRES
View File

File diff suppressed because it is too large Load Diff

2
.circleci/generate.sh
View File

@ -300,8 +300,10 @@ delete_repeated_jobs()
if (! (echo "$env_vars" | grep -q "REPEATED_DTESTS=")); then
delete_job "$1" "j8_dtests_repeat"
delete_job "$1" "j8_dtests_vnode_repeat"
delete_job "$1" "j8_dtests_offheap_repeat"
delete_job "$1" "j11_dtests_repeat"
delete_job "$1" "j11_dtests_vnode_repeat"
delete_job "$1" "j11_dtests_offheap_repeat"
fi
if (! (echo "$env_vars" | grep -q "REPEATED_UPGRADE_DTESTS=")); then
delete_job "$1" "j8_upgrade_dtests_repeat"