This is an automated email from the ASF dual-hosted git repository. marcuse pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 3bb388b364f437ff3a95687857f3efced7eb389a Merge: 0953f77 5f57212 Author: Marcus Eriksson <[email protected]> AuthorDate: Thu Jan 16 10:58:34 2020 +0100 Merge branch 'cassandra-3.0' into cassandra-3.11 .circleci/config-2_1.yml | 74 +++ .circleci/config.yml | 658 +++++---------------- .circleci/config.yml.HIGHRES | 658 +++++---------------- .circleci/config.yml.LOWRES | 658 +++++---------------- CHANGES.txt | 1 + build.xml | 35 ++ .../cassandra/distributed/test/TestLocator.java | 8 +- 7 files changed, 531 insertions(+), 1561 deletions(-) diff --cc .circleci/config-2_1.yml index 5d8d884,a4410fe..b55b1fb --- a/.circleci/config-2_1.yml +++ b/.circleci/config-2_1.yml @@@ -54,13 -54,16 +54,23 @@@ with_dtests_jobs: &with_dtest_job - utests_compression: requires: - start_utests_compression + - start_utests_stress: + type: approval + requires: + - build + - utests_stress: + requires: + - start_utests_stress + - start_jvm_upgrade_dtest: + type: approval + requires: + - build + - dtest_jars_build: + requires: + - start_jvm_upgrade_dtest + - j8_jvm_upgrade_dtests: + requires: + - dtest_jars_build # Java 8 dtests (on request) - start_j8_dtests: type: approval diff --cc .circleci/config.yml index 7016d9b,d80b78d..e0c65f4 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@@ -264,49 -284,6 +284,52 @@@ jobs - CCM_HEAP_NEWSIZE: 256M - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64 - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 + utests_stress: + docker: + - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306 + resource_class: medium + working_directory: ~/ + shell: /bin/bash -eo pipefail -l + parallelism: 1 + steps: + - attach_workspace: + at: /home/cassandra + - run: + name: Run Unit Tests (stress-test) + command: | + export PATH=$JAVA_HOME/bin:$PATH + time mv ~/cassandra /tmp + cd /tmp/cassandra ++ if [ -d ~/dtest_jars ]; then ++ cp ~/dtest_jars/dtest* /tmp/cassandra/build/ ++ fi + ant clean stress-test + no_output_timeout: 15m + - store_test_results: + path: /tmp/cassandra/build/test/output/ + - store_artifacts: + path: /tmp/cassandra/build/test/output + destination: junitxml + - store_artifacts: + path: /tmp/cassandra/build/test/logs + destination: logs + environment: + - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64 + - ANT_HOME: /usr/share/ant + - LANG: en_US.UTF-8 + - KEEP_TEST_DIR: true + - DEFAULT_DIR: /home/cassandra/cassandra-dtest + - PYTHONIOENCODING: utf-8 + - PYTHONUNBUFFERED: true + - CASS_DRIVER_NO_EXTENSIONS: true + - CASS_DRIVER_NO_CYTHON: true + - CASSANDRA_SKIP_SYNC: true + - DTEST_REPO: git://github.com/apache/cassandra-dtest.git + - DTEST_BRANCH: master + - CCM_MAX_HEAP_SIZE: 1024M + - CCM_HEAP_NEWSIZE: 256M + - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64 + - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 j8_unit_tests: docker: - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306 @@@ -669,13 -706,6 +742,23 @@@ workflows - utests_compression: requires: - start_utests_compression + - start_utests_stress: + type: approval + requires: + - build + - utests_stress: + requires: + - start_utests_stress ++ - start_jvm_upgrade_dtest: ++ type: approval ++ requires: ++ - build ++ - dtest_jars_build: ++ requires: ++ - start_jvm_upgrade_dtest ++ - j8_jvm_upgrade_dtests: ++ requires: ++ - dtest_jars_build - start_j8_dtests: type: approval requires: diff --cc .circleci/config.yml.HIGHRES index de74d33,94ca5b2..c6688d9 --- a/.circleci/config.yml.HIGHRES +++ b/.circleci/config.yml.HIGHRES @@@ -264,49 -284,6 +284,52 @@@ jobs - CCM_HEAP_NEWSIZE: 512M - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64 - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 + utests_stress: + docker: + - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306 + resource_class: xlarge + working_directory: ~/ + shell: /bin/bash -eo pipefail -l + parallelism: 1 + steps: + - attach_workspace: + at: /home/cassandra + - run: + name: Run Unit Tests (stress-test) + command: | + export PATH=$JAVA_HOME/bin:$PATH + time mv ~/cassandra /tmp + cd /tmp/cassandra ++ if [ -d ~/dtest_jars ]; then ++ cp ~/dtest_jars/dtest* /tmp/cassandra/build/ ++ fi + ant clean stress-test + no_output_timeout: 15m + - store_test_results: + path: /tmp/cassandra/build/test/output/ + - store_artifacts: + path: /tmp/cassandra/build/test/output + destination: junitxml + - store_artifacts: + path: /tmp/cassandra/build/test/logs + destination: logs + environment: + - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64 + - ANT_HOME: /usr/share/ant + - LANG: en_US.UTF-8 + - KEEP_TEST_DIR: true + - DEFAULT_DIR: /home/cassandra/cassandra-dtest + - PYTHONIOENCODING: utf-8 + - PYTHONUNBUFFERED: true + - CASS_DRIVER_NO_EXTENSIONS: true + - CASS_DRIVER_NO_CYTHON: true + - CASSANDRA_SKIP_SYNC: true + - DTEST_REPO: git://github.com/apache/cassandra-dtest.git + - DTEST_BRANCH: master + - CCM_MAX_HEAP_SIZE: 2048M + - CCM_HEAP_NEWSIZE: 512M + - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64 + - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 j8_unit_tests: docker: - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306 @@@ -669,13 -706,6 +742,23 @@@ workflows - utests_compression: requires: - start_utests_compression + - start_utests_stress: + type: approval + requires: + - build + - utests_stress: + requires: + - start_utests_stress ++ - start_jvm_upgrade_dtest: ++ type: approval ++ requires: ++ - build ++ - dtest_jars_build: ++ requires: ++ - start_jvm_upgrade_dtest ++ - j8_jvm_upgrade_dtests: ++ requires: ++ - dtest_jars_build - start_j8_dtests: type: approval requires: diff --cc .circleci/config.yml.LOWRES index 7016d9b,d80b78d..e0c65f4 --- a/.circleci/config.yml.LOWRES +++ b/.circleci/config.yml.LOWRES @@@ -264,49 -284,6 +284,52 @@@ jobs - CCM_HEAP_NEWSIZE: 256M - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64 - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 + utests_stress: + docker: + - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306 + resource_class: medium + working_directory: ~/ + shell: /bin/bash -eo pipefail -l + parallelism: 1 + steps: + - attach_workspace: + at: /home/cassandra + - run: + name: Run Unit Tests (stress-test) + command: | + export PATH=$JAVA_HOME/bin:$PATH + time mv ~/cassandra /tmp + cd /tmp/cassandra ++ if [ -d ~/dtest_jars ]; then ++ cp ~/dtest_jars/dtest* /tmp/cassandra/build/ ++ fi + ant clean stress-test + no_output_timeout: 15m + - store_test_results: + path: /tmp/cassandra/build/test/output/ + - store_artifacts: + path: /tmp/cassandra/build/test/output + destination: junitxml + - store_artifacts: + path: /tmp/cassandra/build/test/logs + destination: logs + environment: + - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64 + - ANT_HOME: /usr/share/ant + - LANG: en_US.UTF-8 + - KEEP_TEST_DIR: true + - DEFAULT_DIR: /home/cassandra/cassandra-dtest + - PYTHONIOENCODING: utf-8 + - PYTHONUNBUFFERED: true + - CASS_DRIVER_NO_EXTENSIONS: true + - CASS_DRIVER_NO_CYTHON: true + - CASSANDRA_SKIP_SYNC: true + - DTEST_REPO: git://github.com/apache/cassandra-dtest.git + - DTEST_BRANCH: master + - CCM_MAX_HEAP_SIZE: 1024M + - CCM_HEAP_NEWSIZE: 256M + - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64 + - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 j8_unit_tests: docker: - image: spod/cassandra-testing-ubuntu1810-java11-w-dependencies:20190306 @@@ -669,13 -706,6 +742,23 @@@ workflows - utests_compression: requires: - start_utests_compression + - start_utests_stress: + type: approval + requires: + - build + - utests_stress: + requires: + - start_utests_stress ++ - start_jvm_upgrade_dtest: ++ type: approval ++ requires: ++ - build ++ - dtest_jars_build: ++ requires: ++ - start_jvm_upgrade_dtest ++ - j8_jvm_upgrade_dtests: ++ requires: ++ - dtest_jars_build - start_j8_dtests: type: approval requires: diff --cc CHANGES.txt index 4a6867c,025e2ae..54f09a1 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,9 -1,5 +1,10 @@@ -3.0.20 +3.11.6 + * Fix nodetool compactionstats showing extra pending task for TWCS - patch implemented (CASSANDRA-15409) + * Fix SELECT JSON formatting for the "duration" type (CASSANDRA-15075) + * Fix LegacyLayout to have same behavior as 2.x when handling unknown column names (CASSANDRA-15081) + * Update nodetool help stop output (CASSANDRA-15401) +Merged from 3.0: + * Run in-jvm upgrade dtests in circleci (CASSANDRA-15506) * Include updates to static column in mutation size calculations (CASSANDRA-15293) * Fix point-in-time recoevery ignoring timestamp of updates to static columns (CASSANDRA-15292) * GC logs are also put under $CASSANDRA_LOG_DIR (CASSANDRA-14306) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
