(cassandra) 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit abe6d859f2c25882e7b4574b6e13eb5167c377e8 Merge: 42c2bd4bad c485440de3 Author: Mick Semb Wever AuthorDate: Fri Jul 5 16:42:59 2024 +0200 Merge branch 'cassandra-3.0' into cassandra-3.11 * cassandra-3.0: Add termin-8-jdk as a valid jdk8 candidate in the debian package CHANGES.txt| 3 ++- debian/control | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --cc CHANGES.txt index 224e866abd,7ce9a42507..2f7657b49f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -1,10 +1,15 @@@ -3.0.31 +3.11.18 +Merged from 3.0: * Upgrade OWASP to 10.0.0 (CASSANDRA-19738) - + Merged from 2.2: + * Add termin-8-jdk as a valid jdk8 candidate in the debian package (CASSANDRA-19752) - -3.0.30 +3.11.17 + * Move ClientWarn.State#warnings to a thread-safe list (CASSANDRA-19427) + * Fix delayed SSTable release with unsafe_aggressive_sstable_expiration (CASSANDRA-18756) + * Revert CASSANDRA-18543 (CASSANDRA-18854) + * Fix NPE when using udfContext in UDF after a restart of a node (CASSANDRA-18739) +Merged from 3.0: * Fix SCM URL link (CASSANDRA-19422) * Backport CASSANDRA-16418 to 3.x (CASSANDRA-18824) * Suppress CVE-2023-6378 (CASSANDRA-19142) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 7af7f42f5f6e8b7ccf05790a17c0e317015240d5 Merge: d079952c50 44f472d742 Author: Brandon Williams AuthorDate: Mon Apr 15 11:25:11 2024 -0500 Merge branch 'cassandra-3.0' into cassandra-3.11 - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit a766c18481827a0ed7e2612fd3a5dfcbbb8ac199 Merge: 338e4ed618 657e595b78 Author: Brandon Williams AuthorDate: Thu Apr 11 13:50:48 2024 -0500 Merge branch 'cassandra-3.0' into cassandra-3.11 - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 653337ed06dbf024da063107be936f96caea4427 Merge: aa561f2373 0bc95bbebd Author: Brandon Williams AuthorDate: Fri Feb 2 07:22:46 2024 -0600 Merge branch 'cassandra-3.0' into cassandra-3.11 .circleci/config.yml | 12 ++-- .circleci/config.yml.FREE | 12 ++-- .circleci/config.yml.PAID | 12 ++-- .circleci/config_template.yml | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --cc .circleci/config.yml index de447c8d8f,4376feb517..8c9c1e0c48 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@@ -1914,297 -1570,16 +1914,297 @@@ jobs done (exit ${exit_code}) - store_test_results: -path: /tmp/results/repeated_utests/output -- store_artifacts: -path: /tmp/results/repeated_utests/stdout -destination: stdout +path: /tmp/results/repeated_utests/output +- store_artifacts: +path: /tmp/results/repeated_utests/stdout +destination: stdout +- store_artifacts: +path: /tmp/results/repeated_utests/output +destination: junitxml +- store_artifacts: +path: /tmp/results/repeated_utests/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: https://github.com/apache/cassandra-dtest.git +- DTEST_BRANCH: trunk +- CCM_MAX_HEAP_SIZE: 1024M +- CCM_HEAP_NEWSIZE: 256M +- REPEATED_TESTS_STOP_ON_FAILURE: false +- REPEATED_UTESTS: null +- REPEATED_UTESTS_COUNT: 500 +- REPEATED_UTESTS_LONG: null +- REPEATED_UTESTS_LONG_COUNT: 100 +- REPEATED_UTESTS_STRESS: null +- REPEATED_UTESTS_STRESS_COUNT: 500 +- REPEATED_JVM_DTESTS: null +- REPEATED_JVM_DTESTS_COUNT: 500 +- REPEATED_JVM_UPGRADE_DTESTS: null +- REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500 +- REPEATED_DTESTS: null +- REPEATED_DTESTS_COUNT: 500 +- REPEATED_LARGE_DTESTS: null +- REPEATED_LARGE_DTESTS_COUNT: 100 +- REPEATED_UPGRADE_DTESTS: null +- REPEATED_UPGRADE_DTESTS_COUNT: 25 +- REPEATED_ANT_TEST_TARGET: testsome +- REPEATED_ANT_TEST_CLASS: null +- REPEATED_ANT_TEST_METHODS: null +- REPEATED_ANT_TEST_COUNT: 500 +- JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64 +- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 + utests_cdc: +docker: +- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest +resource_class: medium +working_directory: ~/ +shell: /bin/bash -eo pipefail -l +parallelism: 4 +steps: +- attach_workspace: +at: /home/cassandra +- run: +name: Determine unit Tests to Run +command: | + # reminder: this code (along with all the steps) is independently executed on every circle container + # so the goal here is to get the circleci script to return the tests *this* container will run + # which we do via the `circleci` cli tool. + + rm -fr ~/cassandra-dtest/upgrade_tests + echo "***java tests***" + + # get all of our unit test filenames + set -eo pipefail && circleci tests glob "$HOME/cassandra/test/unit/**/*.java" > /tmp/all_java_unit_tests.txt + + # split up the unit tests into groups based on the number of containers we have + set -eo pipefail && circleci tests split --split-by=timings --timings-type=filename --index=${CIRCLE_NODE_INDEX} --total=${CIRCLE_NODE_TOTAL} /tmp/all_java_unit_tests.txt > /tmp/java_tests_${CIRCLE_NODE_INDEX}.txt + set -eo pipefail && cat /tmp/java_tests_${CIRCLE_NODE_INDEX}.txt | sed "s;^/home/cassandra/cassandra/test/unit/;;g" | grep "Test\.java$" > /tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt + echo "** /tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt" + cat /tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt +no_output_timeout: 15m +- run: +name: Log Environment Information +command: | + echo '*** id ***' + id + echo '*** cat /proc/cpuinfo ***' + cat /proc/cpuinfo + echo '*** free -m ***' + free -m + echo '*** df -m ***' + df -m + echo '*** ifconfig -a ***' + ifconfig -a + echo '*** uname -a ***' + uname -a + echo '*** mount ***' + mount + echo '*** env ***' + env +
(cassandra) 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 2e3d7e76f5763698a3a2e161d6ec4773654d3b29 Merge: 6d7cd61412 a1421ec324 Author: Brandon Williams AuthorDate: Wed Dec 6 06:32:19 2023 -0600 Merge branch 'cassandra-3.0' into cassandra-3.11 .build/dependency-check-suppressions.xml | 9 + CHANGES.txt | 1 + 2 files changed, 10 insertions(+) diff --cc .build/dependency-check-suppressions.xml index e3e244e62b,04a74bb4b2..774e2e7886 --- a/.build/dependency-check-suppressions.xml +++ b/.build/dependency-check-suppressions.xml @@@ -90,14 -89,31 +90,23 @@@ CVE-2019-0205 - - + -^pkg:maven/org\.codehaus\.jackson/jackson\-mapper\-asl@.*$ -CVE-2017-7525 -CVE-2017-15095 -CVE-2017-17485 -CVE-2018-5968 -CVE-2018-14718 -CVE-2018-1000873 -CVE-2018-7489 -CVE-2019-10172 -CVE-2019-14540 -CVE-2019-14893 -CVE-2019-16335 -CVE-2019-17267 +^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-databind@.*$ +CVE-2022-42003 +CVE-2022-42004 +CVE-2023-35116 + CVE-2022-42003 + CVE-2022-42004 + + + ^pkg:maven/ch\.qos\.logback/logback\-core@.*$ + CVE-2023-6378 + + + ^pkg:maven/ch\.qos\.logback/logback\-classic@.*$ + CVE-2023-6378 + diff --cc CHANGES.txt index a6cce43bd9,b53bc55d26..96e34db044 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,5 +1,9 @@@ -3.0.30 +3.11.17 + * Fix delayed SSTable release with unsafe_aggressive_sstable_expiration (CASSANDRA-18756) + * Revert CASSANDRA-18543 (CASSANDRA-18854) + * Fix NPE when using udfContext in UDF after a restart of a node (CASSANDRA-18739) +Merged from 3.0: + * Suppress CVE-2023-6378 (CASSANDRA-19142) * Do not set RPC_READY to false on transports shutdown in order to not fail counter updates for deployments with coordinator and storage nodes with transports turned off (CASSANDRA-18935) * Suppress CVE-2023-44487 (CASSANDRA-18943) * Fix nodetool enable/disablebinary to correctly set rpc readiness in gossip (CASSANDRA-18935) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 46996c24bf100fc8a132a8b9df82282d1e94b798 Merge: 997ad8e03b d41afac8bf Author: Brandon Williams AuthorDate: Mon Nov 13 14:14:59 2023 -0600 Merge branch 'cassandra-3.0' into cassandra-3.11 bin/cqlsh.py | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --cc bin/cqlsh.py index 28dc7a1016,566eb6298f..e3b8fce225 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@@ -166,16 -161,20 +166,19 @@@ cqlshlibdir = os.path.join(CASSANDRA_PA if os.path.isdir(cqlshlibdir): sys.path.insert(0, cqlshlibdir) -from cqlshlib import cql3handling, cqlhandling, pylexotron, sslhandling +from cqlshlib import cql3handling, cqlhandling, pylexotron, sslhandling, cqlshhandling from cqlshlib.copyutil import ExportTask, ImportTask from cqlshlib.displaying import (ANSI_RESET, BLUE, COLUMN_NAME_COLORS, CYAN, - RED, FormattedValue, colorme) + RED, WHITE, FormattedValue, colorme) from cqlshlib.formatting import (DEFAULT_DATE_FORMAT, DEFAULT_NANOTIME_FORMAT, - DEFAULT_TIMESTAMP_FORMAT, DateTimeFormat, - format_by_type, format_value_utype, - formatter_for) + DEFAULT_TIMESTAMP_FORMAT, CqlType, DateTimeFormat, + format_by_type, formatter_for) from cqlshlib.tracing import print_trace, print_trace_session from cqlshlib.util import get_file_encoding_bomsize, trim_if_present - from cqlshlib.serverversion import version as build_version + try: + from cqlshlib.serverversion import version as build_version + except ImportError: + build_version = "UNKNOWN" DEFAULT_HOST = '127.0.0.1' DEFAULT_PORT = 9042 - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 349ec3e02d66e72ca7cc9ace02b633c38e4d0fc1 Merge: 3987160bb2 5bf1d2f8d5 Author: Brandon Williams AuthorDate: Thu Oct 26 05:55:46 2023 -0500 Merge branch 'cassandra-3.0' into cassandra-3.11 .build/dependency-check-suppressions.xml | 1 + CHANGES.txt | 1 + 2 files changed, 2 insertions(+) diff --cc CHANGES.txt index dc7c263cc8,4906a982f3..683a5c10cc --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,5 +1,9 @@@ -3.0.30 +3.11.17 + * Fix delayed SSTable release with unsafe_aggressive_sstable_expiration (CASSANDRA-18756) + * Revert CASSANDRA-18543 (CASSANDRA-18854) + * Fix NPE when using udfContext in UDF after a restart of a node (CASSANDRA-18739) +Merged from 3.0: + * Suppress CVE-2023-44487 (CASSANDRA-18943) * Fix nodetool enable/disablebinary to correctly set rpc readiness in gossip (CASSANDRA-18935) * Implement the logic in bin/stop-server (CASSANDRA-18838) * Upgrade snappy-java to 1.1.10.4 (CASSANDRA-18878) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 14e89fc3c721ad1b7728ee665311d92cc37d8575 Merge: be0c563097 ce49e775f7 Author: Mick Semb Wever AuthorDate: Thu Aug 31 22:36:08 2023 +0200 Merge branch 'cassandra-3.0' into cassandra-3.11 * cassandra-3.0: Missing license info and headers .build/build-rat.xml | 85 -- .jenkins/Jenkinsfile | 13 ++-- build.properties.default | 19 + conf/cassandra-jaas.config | 16 conf/jvm.options | 18 + debian/cassandra.conf | 17 + debian/cassandra.postinst | 17 + debian/default | 17 + debian/init| 16 debian/nodetool-completion | 15 debian/rules | 17 - pylib/cqlshlib/setup.cfg | 15 pylib/requirements.txt | 16 .../cassandra/cql3/functions/JavaSourceUDF.txt | 17 + 14 files changed, 253 insertions(+), 45 deletions(-) diff --cc .build/build-rat.xml index 3926660ad6,eb341c3024..93133dc63c --- a/.build/build-rat.xml +++ b/.build/build-rat.xml @@@ -37,46 -37,55 +37,57 @@@ - - - - - - - - - - - - ++ - + - - - - - - - - - - - - - - - - - - - - + + + + + + + - ++ ++ + + + + + + + + + + + + + + + + - - - - - ++ + + + + + + + + + + + + + + + + + + + + diff --cc conf/cassandra-jaas.config index f3a9bf7055,00..e636ca544d mode 100644,00..100644 --- a/conf/cassandra-jaas.config +++ b/conf/cassandra-jaas.config @@@ -1,4 -1,0 +1,20 @@@ ++// Licensed to the Apache Software Foundation (ASF) under one ++// or more contributor license agreements. See the NOTICE file ++// distributed with this work for additional information ++// regarding copyright ownership. The ASF licenses this file ++// to you under the Apache License, Version 2.0 (the ++// "License"); you may not use this file except in compliance ++// with the License. You may obtain a copy of the License at ++// ++// http://www.apache.org/licenses/LICENSE-2.0 ++// ++// Unless required by applicable law or agreed to in writing, software ++// distributed under the License is distributed on an "AS IS" BASIS, ++// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++// Se# Licensed to the Apache Software Foundation (ASF) under onee the License for the specific language governing permissions and ++// limitations under the License. ++// +// Delegates authentication to Cassandra's configured IAuthenticator +CassandraLogin { + org.apache.cassandra.auth.CassandraLoginModule REQUIRED; +}; diff --cc debian/cassandra.conf index 72ede9ed0b,d310d78f2c..6e3eefb59b --- a/debian/cassandra.conf +++ b/debian/cassandra.conf @@@ -1,3 -1,19 +1,20 @@@ + # Licensed to the Apache Software Foundation (ASF) under one + # or more contributor license agreements. See the NOTICE file + # distributed with this work for additional information + # regarding copyright ownership. The ASF licenses this file + # to you under the Apache License, Version 2.0 (the + # "License"); yo
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit b21645474addd65bea60d77b14e6848819c0da27 Merge: da3c400675 0b34ff6a0b Author: Brandon Williams AuthorDate: Fri Aug 18 13:57:06 2023 -0500 Merge branch 'cassandra-3.0' into cassandra-3.11 bin/cqlsh.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit d173f57558c7e9e2866499cb194beab3371ddd0d Merge: 1dd38998a0 ade85693d5 Author: Brandon Williams AuthorDate: Fri Aug 18 10:40:39 2023 -0500 Merge branch 'cassandra-3.0' into cassandra-3.11 .gitignore | 1 + 1 file changed, 1 insertion(+) diff --cc .gitignore index 71dadaae89,782ec71a37..bf4213f97f --- a/.gitignore +++ b/.gitignore @@@ -9,8 -9,8 +9,9 @@@ logs data/ conf/hotspot_compiler doc/cql3/CQL.html +doc/build/ pylib/src/ + pylib/cqlshlib/serverversion.py lib/ # C* debs - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 1dd38998a06887f47aa619bb84e98e531b9bf8fb Merge: c870641475 6bb585bf5d Author: Brandon Williams AuthorDate: Fri Aug 18 10:09:49 2023 -0500 Merge branch 'cassandra-3.0' into cassandra-3.11 .build/build-cqlsh.xml | 24 CHANGES.txt| 2 ++ bin/cqlsh.py | 11 +++ build.xml | 3 ++- 4 files changed, 39 insertions(+), 1 deletion(-) diff --cc CHANGES.txt index b8f489b183,702733eaaf..7ee07ec953 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,18 -1,6 +1,20 @@@ +3.11.17 +Merged from 3.0: + 3.0.30 + * CQLSH emits a warning when the server version doesn't match (CASSANDRA-18745) * Fix missing speculative retries in tablestats (CASSANDRA-18767) + + +3.11.16 + * Moved jflex from runtime to build dependencies (CASSANDRA-18664) + * Fix CAST function for float to decimal (CASSANDRA-18647) + * Suppress CVE-2022-45688 (CASSANDRA-18643) + * Remove unrepaired SSTables from garbage collection when only_purge_repaired_tombstones is true (CASSANDRA-14204) + * Wait for live endpoints in gossip waiting to settle (CASSANDRA-18543) + * Fix error message handling when trying to use CLUSTERING ORDER with non-clustering column (CASSANDRA-17818 + * Add keyspace and table name to exception message during ColumnSubselection deserialization (CASSANDRA-18346) + * Remove unnecessary String.format invocation in QueryProcessor when getting a prepared statement from cache (CASSANDRA-17202) +Merged from 3.0: * Fix Requires for Java for RPM package (CASSANDRA-18751) * Fix CQLSH online help topic link (CASSANDRA-17534) * Remove unused suppressions (CASSANDRA-18724) diff --cc bin/cqlsh.py index ba32369529,f9fcc656d5..a2f1a9e5ed --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@@ -166,15 -161,17 +166,16 @@@ cqlshlibdir = os.path.join(CASSANDRA_PA if os.path.isdir(cqlshlibdir): sys.path.insert(0, cqlshlibdir) -from cqlshlib import cql3handling, cqlhandling, pylexotron, sslhandling +from cqlshlib import cql3handling, cqlhandling, pylexotron, sslhandling, cqlshhandling from cqlshlib.copyutil import ExportTask, ImportTask from cqlshlib.displaying import (ANSI_RESET, BLUE, COLUMN_NAME_COLORS, CYAN, - RED, FormattedValue, colorme) + RED, WHITE, FormattedValue, colorme) from cqlshlib.formatting import (DEFAULT_DATE_FORMAT, DEFAULT_NANOTIME_FORMAT, - DEFAULT_TIMESTAMP_FORMAT, DateTimeFormat, - format_by_type, format_value_utype, - formatter_for) + DEFAULT_TIMESTAMP_FORMAT, CqlType, DateTimeFormat, + format_by_type, formatter_for) from cqlshlib.tracing import print_trace, print_trace_session from cqlshlib.util import get_file_encoding_bomsize, trim_if_present + from cqlshlib.serverversion import version as build_version DEFAULT_HOST = '127.0.0.1' DEFAULT_PORT = 9042 - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit c87064147595f2f1260d0bb197afc5bc968db45d Merge: 681b6ca103 fd9f07dab8 Author: Brandon Williams AuthorDate: Fri Aug 18 05:08:36 2023 -0500 Merge branch 'cassandra-3.0' into cassandra-3.11 CHANGES.txt | 5 + src/java/org/apache/cassandra/tools/nodetool/stats/StatsTable.java | 1 + .../org/apache/cassandra/tools/nodetool/stats/TableStatsHolder.java | 2 ++ .../org/apache/cassandra/tools/nodetool/stats/TableStatsPrinter.java | 1 + 4 files changed, 9 insertions(+) diff --cc CHANGES.txt index 8456e8cad4,ea9b1024e3..b8f489b183 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,5 +1,18 @@@ -3.0.30 ++3.11.17 ++Merged from 3.0: + * Fix missing speculative retries in tablestats (CASSANDRA-18767) ++ ++ +3.11.16 + * Moved jflex from runtime to build dependencies (CASSANDRA-18664) + * Fix CAST function for float to decimal (CASSANDRA-18647) + * Suppress CVE-2022-45688 (CASSANDRA-18643) + * Remove unrepaired SSTables from garbage collection when only_purge_repaired_tombstones is true (CASSANDRA-14204) + * Wait for live endpoints in gossip waiting to settle (CASSANDRA-18543) + * Fix error message handling when trying to use CLUSTERING ORDER with non-clustering column (CASSANDRA-17818 + * Add keyspace and table name to exception message during ColumnSubselection deserialization (CASSANDRA-18346) + * Remove unnecessary String.format invocation in QueryProcessor when getting a prepared statement from cache (CASSANDRA-17202) +Merged from 3.0: * Fix Requires for Java for RPM package (CASSANDRA-18751) * Fix CQLSH online help topic link (CASSANDRA-17534) * Remove unused suppressions (CASSANDRA-18724) diff --cc src/java/org/apache/cassandra/tools/nodetool/stats/StatsTable.java index 87bc527608,00..8a32caf88e mode 100644,00..100644 --- a/src/java/org/apache/cassandra/tools/nodetool/stats/StatsTable.java +++ b/src/java/org/apache/cassandra/tools/nodetool/stats/StatsTable.java @@@ -1,66 -1,0 +1,67 @@@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.cassandra.tools.nodetool.stats; + +import java.util.ArrayList; +import java.util.List; + +public class StatsTable +{ +public String name; +public boolean isIndex; +public boolean isLeveledSstable = false; +public Object sstableCount; +public String spaceUsedLive; +public String spaceUsedTotal; +public String spaceUsedBySnapshotsTotal; +public boolean offHeapUsed = false; +public String offHeapMemoryUsedTotal; +public Object sstableCompressionRatio; +public Object numberOfPartitionsEstimate; +public Object memtableCellCount; +public String memtableDataSize; +public boolean memtableOffHeapUsed = false; +public String memtableOffHeapMemoryUsed; +public Object memtableSwitchCount; ++public Object speculativeRetries; +public long localReadCount; +public double localReadLatencyMs; +public long localWriteCount; +public double localWriteLatencyMs; +public Object pendingFlushes; +public Object bloomFilterFalsePositives; +public Object bloomFilterFalseRatio; +public String bloomFilterSpaceUsed; +public boolean bloomFilterOffHeapUsed = false; +public String bloomFilterOffHeapMemoryUsed; +public boolean indexSummaryOffHeapUsed = false; +public String indexSummaryOffHeapMemoryUsed; +public boolean compressionMetadataOffHeapUsed = false; +public String compressionMetadataOffHeapMemoryUsed; +public long compactedPartitionMinimumBytes; +public long compactedPartitionMaximumBytes; +public long compactedPartitionMeanBytes; +public double percentRepaired; +public double averageLiveCellsPerSliceLastFiveMinutes; +public long maximumLiveCellsPerSliceLastFiveMinutes; +public double averageTombstonesPerSliceLastFiveMinutes; +public long maximumTombstonesPerSliceLastFiveMinutes; +public String droppedMutations;
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 60d04d6713c9bc604d4528bf4df9cce7cd84c67a Merge: bee215cce6 5c4dd3b993 Author: Brandon Williams AuthorDate: Tue Aug 8 10:03:31 2023 -0500 Merge branch 'cassandra-3.0' into cassandra-3.11 .build/dependency-check-suppressions.xml | 43 CHANGES.txt | 1 + 2 files changed, 1 insertion(+), 43 deletions(-) diff --cc .build/dependency-check-suppressions.xml index 58b38b7e62,d0a81458db..47d37c53db --- a/.build/dependency-check-suppressions.xml +++ b/.build/dependency-check-suppressions.xml @@@ -126,20 -88,22 +89,14 @@@ CVE-2019-0205 - - + -^pkg:maven/org\.codehaus\.jackson/jackson\-mapper\-asl@.*$ -CVE-2017-7525 -CVE-2017-15095 -CVE-2017-17485 -CVE-2018-5968 -CVE-2018-14718 -CVE-2018-1000873 -CVE-2018-7489 -CVE-2019-10172 -CVE-2019-14540 -CVE-2019-14893 -CVE-2019-16335 -CVE-2019-17267 +^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-databind@.*$ +CVE-2022-42003 +CVE-2022-42004 +CVE-2023-35116 + CVE-2022-42003 + CVE-2022-42004 - - - ^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-core@.*$ - CVE-2022-45688 - - diff --cc CHANGES.txt index 86f4b5c758,697262750a..8ca47eb52d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,5 +1,14 @@@ -3.0.30 +3.11.16 + * Moved jflex from runtime to build dependencies (CASSANDRA-18664) + * Fix CAST function for float to decimal (CASSANDRA-18647) + * Suppress CVE-2022-45688 (CASSANDRA-18643) + * Remove unrepaired SSTables from garbage collection when only_purge_repaired_tombstones is true (CASSANDRA-14204) + * Wait for live endpoints in gossip waiting to settle (CASSANDRA-18543) + * Fix error message handling when trying to use CLUSTERING ORDER with non-clustering column (CASSANDRA-17818 + * Add keyspace and table name to exception message during ColumnSubselection deserialization (CASSANDRA-18346) + * Remove unnecessary String.format invocation in QueryProcessor when getting a prepared statement from cache (CASSANDRA-17202) +Merged from 3.0: + * Remove unused suppressions (CASSANDRA-18724) * Upgrade OWASP to 8.3.1 (CASSANDRA-18650) * Suppress CVE-2023-34462 (CASSANDRA-18649) * Add support for AWS Ec2 IMDSv2 (CASSANDRA-16555) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 3f09baf1c2e833cc3028be08ab753f6c48788210 Merge: 5326a39a1c 493d15fffa Author: Brandon Williams AuthorDate: Fri Jul 7 10:41:42 2023 -0500 Merge branch 'cassandra-3.0' into cassandra-3.11 .build/build-owasp.xml | 2 +- .build/dependency-check-suppressions.xml | 10 ++ CHANGES.txt | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --cc .build/dependency-check-suppressions.xml index bffab75a23,dead8f6120..58b38b7e62 --- a/.build/dependency-check-suppressions.xml +++ b/.build/dependency-check-suppressions.xml @@@ -117,19 -116,38 +117,29 @@@ CVE-2018-11798 CVE-2019-0205 + + ^pkg:maven/com\.thinkaurelius\.thrift/thrift-server@.*$ + CVE-2015-3254 + CVE-2016-5397 + CVE-2018-1320 + CVE-2018-11798 + CVE-2019-0205 + - - - -^pkg:maven/org\.codehaus\.jackson/jackson\-mapper\-asl@.*$ -CVE-2017-7525 -CVE-2017-15095 -CVE-2017-17485 -CVE-2018-5968 -CVE-2018-14718 -CVE-2018-1000873 -CVE-2018-7489 -CVE-2019-10172 -CVE-2019-14540 -CVE-2019-14893 -CVE-2019-16335 -CVE-2019-17267 - - + ^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-databind@.*$ +CVE-2022-42003 +CVE-2022-42004 CVE-2023-35116 + CVE-2022-42003 + CVE-2022-42004 + + +^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-core@.*$ +CVE-2022-45688 + + diff --cc CHANGES.txt index 2c8a444f55,fbe5e0751b..33e4983986 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,5 +1,12 @@@ -3.0.30 +3.11.16 + * Suppress CVE-2022-45688 (CASSANDRA-18643) + * Remove unrepaired SSTables from garbage collection when only_purge_repaired_tombstones is true (CASSANDRA-14204) + * Wait for live endpoints in gossip waiting to settle (CASSANDRA-18543) + * Fix error message handling when trying to use CLUSTERING ORDER with non-clustering column (CASSANDRA-17818 + * Add keyspace and table name to exception message during ColumnSubselection deserialization (CASSANDRA-18346) + * Remove unnecessary String.format invocation in QueryProcessor when getting a prepared statement from cache (CASSANDRA-17202) +Merged from 3.0: + * Upgrade OWASP to 8.3.1 (CASSANDRA-18650) * Suppress CVE-2023-34462 (CASSANDRA-18649) * Add support for AWS Ec2 IMDSv2 (CASSANDRA-16555) * Suppress CVE-2023-35116 (CASSANDRA-18630) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 5326a39a1ccfff9141f49246b57f59c504f8d2d3 Merge: d302b837b2 7150cc5b99 Author: Brandon Williams AuthorDate: Thu Jul 6 09:59:13 2023 -0500 Merge branch 'cassandra-3.0' into cassandra-3.11 .build/dependency-check-suppressions.xml | 1 + CHANGES.txt | 1 + 2 files changed, 2 insertions(+) diff --cc CHANGES.txt index 44ffd6e824,cc2eea7a38..2c8a444f55 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,5 +1,12 @@@ -3.0.30 +3.11.16 + * Suppress CVE-2022-45688 (CASSANDRA-18643) + * Remove unrepaired SSTables from garbage collection when only_purge_repaired_tombstones is true (CASSANDRA-14204) + * Wait for live endpoints in gossip waiting to settle (CASSANDRA-18543) + * Fix error message handling when trying to use CLUSTERING ORDER with non-clustering column (CASSANDRA-17818 + * Add keyspace and table name to exception message during ColumnSubselection deserialization (CASSANDRA-18346) + * Remove unnecessary String.format invocation in QueryProcessor when getting a prepared statement from cache (CASSANDRA-17202) +Merged from 3.0: + * Suppress CVE-2023-34462 (CASSANDRA-18649) * Add support for AWS Ec2 IMDSv2 (CASSANDRA-16555) * Suppress CVE-2023-35116 (CASSANDRA-18630) * Pass taskId from CompactionTask to system.compaction_history (CASSANDRA-12183) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 293f14cf36b3340ca301e17d625830a5c5ecbfc8 Merge: 55dc5b43f1 de7b1584f8 Author: Brandon Williams AuthorDate: Wed Jun 28 06:04:26 2023 -0500 Merge branch 'cassandra-3.0' into cassandra-3.11 .build/dependency-check-suppressions.xml | 6 +++--- CHANGES.txt | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --cc .build/dependency-check-suppressions.xml index 9596ee5d03,d59b76b873..e6fe535381 --- a/.build/dependency-check-suppressions.xml +++ b/.build/dependency-check-suppressions.xml @@@ -117,16 -116,27 +117,16 @@@ CVE-2019-0205 - - + -^pkg:maven/org\.codehaus\.jackson/jackson\-mapper\-asl@.*$ -CVE-2017-7525 -CVE-2017-15095 -CVE-2017-17485 -CVE-2018-5968 -CVE-2018-14718 -CVE-2018-1000873 -CVE-2018-7489 -CVE-2019-10172 -CVE-2019-14540 -CVE-2019-14893 -CVE-2019-16335 -CVE-2019-17267 +^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-databind@.*$ +CVE-2022-42003 +CVE-2022-42004 ++CVE-2023-35116 - + - ^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-core.*$ - CVE-2022-45688 + ^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-databind@.*$ -CVE-2023-35116 diff --cc CHANGES.txt index 566aaa8583,5a1a609b06..2b38760593 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,9 -1,5 +1,10 @@@ -3.0.30 +3.11.16 + * Wait for live endpoints in gossip waiting to settle (CASSANDRA-18543) + * Fix error message handling when trying to use CLUSTERING ORDER with non-clustering column (CASSANDRA-17818 + * Add keyspace and table name to exception message during ColumnSubselection deserialization (CASSANDRA-18346) + * Remove unnecessary String.format invocation in QueryProcessor when getting a prepared statement from cache (CASSANDRA-17202) +Merged from 3.0: + * Suppress CVE-2023-35116 (CASSANDRA-18630) * Pass taskId from CompactionTask to system.compaction_history (CASSANDRA-12183) * Suppress CVE-2023-34455, CVE-2023-34454, CVE-2023-34453 (CASSANDRA-18608) * Backport CASSANDRA-10508: Remove hard-coded SSL cipher suites (CASSANDRA-18575) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit b15a7da20863efb85ffa892b1d19891563cc44dd Merge: 254991750c d99bccd649 Author: Brandon Williams AuthorDate: Mon Jun 26 06:04:45 2023 -0500 Merge branch 'cassandra-3.0' into cassandra-3.11 .build/dependency-check-suppressions.xml | 7 +++ CHANGES.txt | 1 + 2 files changed, 8 insertions(+) diff --cc CHANGES.txt index f36257a8e1,43b4cc40fb..dc0d7e99af --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,9 -1,5 +1,10 @@@ -3.0.30 +3.11.16 + * Wait for live endpoints in gossip waiting to settle (CASSANDRA-18543) + * Fix error message handling when trying to use CLUSTERING ORDER with non-clustering column (CASSANDRA-17818 + * Add keyspace and table name to exception message during ColumnSubselection deserialization (CASSANDRA-18346) + * Remove unnecessary String.format invocation in QueryProcessor when getting a prepared statement from cache (CASSANDRA-17202) +Merged from 3.0: + * Suppress CVE-2023-34455, CVE-2023-34454, CVE-2023-34453 (CASSANDRA-18608) * Backport CASSANDRA-10508: Remove hard-coded SSL cipher suites (CASSANDRA-18575) * Suppress CVE-2023-2976 (CASSANDRA-18562) * Remove dh_python use in Debian packaging (CASSANDRA-18558) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit ece247b6eea44452ba90a02901f9e379e18938d1 Merge: 64d953fdca e67fa69114 Author: Brandon Williams AuthorDate: Wed Jun 21 06:26:30 2023 -0500 Merge branch 'cassandra-3.0' into cassandra-3.11 - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 7de3e61d7533da30c7b43f2d8dac2c5b89f488cc Merge: 3855c8a194 c91e2714b9 Author: Bereng AuthorDate: Mon Jun 12 10:00:24 2023 +0200 Merge branch 'cassandra-3.0' into cassandra-3.11 * cassandra-3.0: Generate.sh -s param to skip autodetection of tests .circleci/generate.sh | 12 +--- .circleci/readme.md | 3 +++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --cc .circleci/generate.sh index f6203d8255,94d46f10e0..8e3026a7e5 --- a/.circleci/generate.sh +++ b/.circleci/generate.sh @@@ -91,10 -95,10 +95,12 @@@ while getopts "e:afpib:s" opt; d fi has_env_vars=true ;; + b ) BASE_BRANCH="$OPTARG" + ;; i ) check_env_vars=false ;; + s ) detect_changed_tests=false + ;; \?) die "Invalid option: -$OPTARG" ;; esac - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 3855c8a194d1d9ac904429407cb9586a6178e2f0 Merge: 03da864bab 8d3c30dde4 Author: Andrés de la Peña AuthorDate: Wed Jun 7 11:04:01 2023 +0100 Merge branch 'cassandra-3.0' into cassandra-3.11 .circleci/generate.sh | 19 --- 1 file changed, 16 insertions(+), 3 deletions(-) diff --cc .circleci/generate.sh index 64d443e211,40bdd205db..f6203d8255 --- a/.circleci/generate.sh +++ b/.circleci/generate.sh @@@ -88,6 -91,6 +91,8 @@@ while getopts "e:afpib:" opt; d fi has_env_vars=true ;; ++ b ) BASE_BRANCH="$OPTARG" ++ ;; i ) check_env_vars=false ;; \?) die "Invalid option: -$OPTARG" - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 9c970cc1171255ec2deb0eab20095cd12f99bbfb Merge: 572db17350 e28ef4089e Author: Brandon Williams AuthorDate: Mon Jun 5 05:58:01 2023 -0500 Merge branch 'cassandra-3.0' into cassandra-3.11 .build/dependency-check-suppressions.xml | 1 + CHANGES.txt | 2 ++ 2 files changed, 3 insertions(+) diff --cc CHANGES.txt index 0aed2d9f62,728a529c87..d86b27595f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,6 -1,5 +1,8 @@@ +3.11.16 + * Remove unnecessary String.format invocation in QueryProcessor when getting a prepared statement from cache (CASSANDRA-17202) +Merged from 3.0: + 3.0.30 + * Suppress CVE-2023-2976 (CASSANDRA-18562) * Remove dh_python use in Debian packaging (CASSANDRA-18558) * Pass down all contact points to driver for cassandra-stress (CASSANDRA-18025) * Validate the existence of a datacenter in nodetool rebuild (CASSANDRA-14319) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 572db1735070806a5a2dc4e5f1b7e3a88dac6a26 Merge: 1923e6955a f72df5449a Author: Brandon Williams AuthorDate: Thu Jun 1 15:29:58 2023 -0500 Merge branch 'cassandra-3.0' into cassandra-3.11 - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 1923e6955a6f17bfbcf3a0104d80886a702dcdcd Merge: 43ec184391 527c0cb3a0 Author: Brandon Williams AuthorDate: Thu Jun 1 15:00:33 2023 -0500 Merge branch 'cassandra-3.0' into cassandra-3.11 CHANGES.txt | 1 + debian/rules | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --cc CHANGES.txt index bcba8b9233,a45c3f964b..0aed2d9f62 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,16 -1,10 +1,17 @@@ -3.0.30 +3.11.16 + * Remove unnecessary String.format invocation in QueryProcessor when getting a prepared statement from cache (CASSANDRA-17202) +Merged from 3.0: + * Remove dh_python use in Debian packaging (CASSANDRA-18558) * Pass down all contact points to driver for cassandra-stress (CASSANDRA-18025) * Validate the existence of a datacenter in nodetool rebuild (CASSANDRA-14319) - -3.0.29 * Suppress CVE-2023-2251 (CASSANDRA-18497) + +3.11.15 + * Fix the capital P usage in the CQL parser (CASSANDRA-17919) + * Fix sstable_count metric missing from tablestats json/yaml output (CASSANDRA-18448) + * Suppress CVE-2022-45688 (CASSANDRA-18389) + * Fix Splitter sometimes creating more splits than requested (CASSANDRA-18013) +Merged from 3.0: * Do not remove SSTables when cause of FSReadError is OutOfMemoryError while using best_effort disk failure policy (CASSANDRA-18336) * Do not remove truncated_at entry in system.local while dropping an index (CASSANDRA-18105) * Save host id to system.local and flush immediately after startup (CASSANDRA-18153) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit b11021ee68e2ac607f12b32ac84a1ee59ee533db Merge: 9ab3a82ffa 785e291900 Author: Brandon Williams AuthorDate: Mon May 15 11:22:05 2023 -0500 Merge branch 'cassandra-3.0' into cassandra-3.11 - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit b6b71c598eef1a01c52cef0e7fa54c6e24d39095 Merge: 90d0857d34 4a62757624 Author: Brandon Williams AuthorDate: Thu May 4 10:22:25 2023 -0500 Merge branch 'cassandra-3.0' into cassandra-3.11 .build/dependency-check-suppressions.xml | 1 + CHANGES.txt | 4 2 files changed, 5 insertions(+) diff --cc .build/dependency-check-suppressions.xml index 68c97bb777,5a87f57c3f..98efddce73 --- a/.build/dependency-check-suppressions.xml +++ b/.build/dependency-check-suppressions.xml @@@ -23,13 -23,13 +23,14 @@@ ^pkg:maven/org\.yaml/snakeyaml@.*$ + CVE-2023-2251 -CVE-2022-38752 -CVE-2022-38751 -CVE-2022-38750 -CVE-2022-41854 +CVE-2017-18640 CVE-2022-25857 CVE-2022-38749 +CVE-2022-38750 +CVE-2022-38751 +CVE-2022-38752 +CVE-2022-41854 CVE-2022-1471 CVE-2022-3064 CVE-2021-4235 diff --cc CHANGES.txt index d80d0be71e,371ba6c526..b132527d5c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,9 -1,5 +1,13 @@@ -3.0.29 ++3.11.16 ++Merged from 3.0: + * Suppress CVE-2023-2251 (CASSANDRA-18497) ++ +3.11.15 + * Fix the capital P usage in the CQL parser (CASSANDRA-17919) + * Fix sstable_count metric missing from tablestats json/yaml output (CASSANDRA-18448) + * Suppress CVE-2022-45688 (CASSANDRA-18389) + * Fix Splitter sometimes creating more splits than requested (CASSANDRA-18013) +Merged from 3.0: * Do not remove SSTables when cause of FSReadError is OutOfMemoryError while using best_effort disk failure policy (CASSANDRA-18336) * Do not remove truncated_at entry in system.local while dropping an index (CASSANDRA-18105) * Save host id to system.local and flush immediately after startup (CASSANDRA-18153) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 4b3cb0a772b7ab0de9dec19c148388d1aea729db Merge: 326b5aceb1 02048cffea Author: Andrés de la Peña AuthorDate: Fri Mar 10 11:50:04 2023 + Merge branch 'cassandra-3.0' into cassandra-3.11 .circleci/config-2_1.yml.high_res.patch| 96 - .circleci/{config.yml.LOWRES => config.yml.FREE} |0 .circleci/config.yml.HIGHRES | 3977 .circleci/{config.yml.MIDRES => config.yml.PAID} |0 .circleci/{config-2_1.yml => config_template.yml} |0 ...id_res.patch => config_template.yml.PAID.patch} |0 .circleci/generate.sh | 107 +- .circleci/readme.md| 98 +- 8 files changed, 93 insertions(+), 4185 deletions(-) diff --cc .circleci/readme.md index c27cf13d2d,e65be5158a..7391ed11cf --- a/.circleci/readme.md +++ b/.circleci/readme.md @@@ -66,13 -71,12 +71,13 @@@ generate.sh -p ## Running tests in a loop Running the `generate.sh` script with use `git diff` to find the new or modified tests. The script will then create jobs to run each of these new or modified tests for a certain -number of times, to verify that they are stable. You can use environment variables to +number of times, to verify that they are stable. You can use environment variables to specify the number of iterations of each type of test: ``` - generate.sh -m \ + generate.sh -p \ -e REPEATED_UTESTS_COUNT=500 \ -e REPEATED_UTESTS_LONG_COUNT=100 \ + -e REPEATED_UTESTS_STRESS_COUNT=500 \ -e REPEATED_SIMULATOR_DTESTS_COUNT=500 \ -e REPEATED_JVM_DTESTS_COUNT=500 \ -e REPEATED_JVM_UPGRADE_DTESTS_COUNT=500 \ @@@ -88,10 -92,9 +93,10 @@@ generate.sh -p -e REPEATED_TESTS_STOP_O In addition to the automatically detected tests, it's also possible to provide lists of specific tests to be repeated: ``` - generate.sh -m \ + generate.sh -p \ -e REPEATED_UTESTS=org.apache.cassandra.cql3.ViewTest,org.apache.cassandra.db.CellTest \ -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 \ - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 326b5aceb188912f377aac1e36485e0054605851 Merge: 4b84a8d7ac be574fc34b Author: Brandon Williams AuthorDate: Thu Mar 9 10:01:06 2023 -0600 Merge branch 'cassandra-3.0' into cassandra-3.11 CHANGES.txt| 1 + .../cassandra/service/DefaultFSErrorHandler.java | 2 + ...ava => JVMStabilityInspectorThrowableTest.java} | 72 --- .../service/DefaultFSErrorHandlerTest.java | 121 ++ .../cassandra/service/DiskFailurePolicyTest.java | 135 + .../org/apache/cassandra/utils/KillerForTests.java | 6 + 6 files changed, 322 insertions(+), 15 deletions(-) diff --cc CHANGES.txt index c00315d495,aa1e60427a..2812ae77d1 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,6 -1,5 +1,7 @@@ -3.0.29 +3.11.15 + * Fix Splitter sometimes creating more splits than requested (CASSANDRA-18013) +Merged from 3.0: + * Fix default file system error handler for disk_failure_policy die (CASSANDRA-18294) * Introduce check for names of test classes (CASSANDRA-17964) * Suppress CVE-2022-41915 (CASSANDRA-18147) * Suppress CVE-2021-1471, CVE-2021-3064, CVE-2021-4235 (CASSANDRA-18149) diff --cc test/distributed/org/apache/cassandra/distributed/test/JVMStabilityInspectorThrowableTest.java index b9e8d679b8,d7aeccaf6f..efe05ca1a6 --- a/test/distributed/org/apache/cassandra/distributed/test/JVMStabilityInspectorThrowableTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/JVMStabilityInspectorThrowableTest.java @@@ -181,19 -211,27 +212,25 @@@ public class JVMStabilityInspectorThrow private static final class CorruptedSSTableReader extends ForwardingSSTableReader { - public CorruptedSSTableReader(SSTableReader delegate) + private boolean shouldThrowCorrupted; + public CorruptedSSTableReader(SSTableReader delegate, boolean shouldThrowCorrupted) { super(delegate); + this.shouldThrowCorrupted = shouldThrowCorrupted; } -@Override -public SliceableUnfilteredRowIterator iterator(DecoratedKey key, ColumnFilter selectedColumns, boolean reversed, boolean isForThrift, SSTableReadsListener listener) +public UnfilteredRowIterator iterator(DecoratedKey key, Slices slices, ColumnFilter selectedColumns, boolean reversed, boolean isForThrift, SSTableReadsListener listener) { - throw throwCorrupted(); + if (shouldThrowCorrupted) + throw throwCorrupted(); + throw throwFSError(); } -@Override -public SliceableUnfilteredRowIterator iterator(FileDataInput file, DecoratedKey key, RowIndexEntry indexEntry, ColumnFilter selectedColumns, boolean reversed, boolean isForThrift) +public UnfilteredRowIterator iterator(FileDataInput file, DecoratedKey key, RowIndexEntry indexEntry, Slices slices, ColumnFilter selectedColumns, boolean reversed, boolean isForThrift) { - throw throwCorrupted(); + if (shouldThrowCorrupted) + throw throwCorrupted(); + throw throwFSError(); } private CorruptSSTableException throwCorrupted() diff --cc test/unit/org/apache/cassandra/utils/KillerForTests.java index fe9aa4599c,ad3a27436e..a802809722 --- a/test/unit/org/apache/cassandra/utils/KillerForTests.java +++ b/test/unit/org/apache/cassandra/utils/KillerForTests.java @@@ -42,9 -29,11 +42,15 @@@ public class KillerForTests extends JVM @Override protected void killCurrentJVM(Throwable t, boolean quiet) { +if (!expected) +Assert.fail("Saw JVM Kill but did not expect it."); + + if (killed) + { + // Can only be killed once + return; + } ++ this.killed = true; this.quiet = quiet; } - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 4b84a8d7ac5875bed35c81e1f0107c495452ba0b Merge: a5b05cea5e 5374f56a0a Author: Brandon Williams AuthorDate: Fri Feb 24 12:29:37 2023 -0600 Merge branch 'cassandra-3.0' into cassandra-3.11 .build/dependency-check-suppressions.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --cc .build/dependency-check-suppressions.xml index 8bd46b0abc,4438f2259e..b0603e3f90 --- a/.build/dependency-check-suppressions.xml +++ b/.build/dependency-check-suppressions.xml @@@ -23,15 -23,14 +23,15 @@@ ^pkg:maven/org\.yaml/snakeyaml@.*$ -CVE-2022-38752 -CVE-2022-38751 -CVE-2022-38750 -CVE-2022-41854 +CVE-2017-18640 CVE-2022-25857 CVE-2022-38749 +CVE-2022-38750 +CVE-2022-38751 +CVE-2022-38752 +CVE-2022-41854 - CVE-2021-1471 - CVE-2021-3064 + CVE-2022-1471 + CVE-2022-3064 CVE-2021-4235 CVE-2017-18640 - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit a5b05cea5e2843d7ada11c03de823b8c07fb5455 Merge: 788b4eca2d eb36a86a72 Author: Brandon Williams AuthorDate: Wed Feb 22 10:24:22 2023 -0600 Merge branch 'cassandra-3.0' into cassandra-3.11 NOTICE.txt | 2 +- build.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit e9aa5ec514c436a8fb7dede10fa97b8d8cca200c Merge: 92245b0f07 9a64be3234 Author: Brandon Williams AuthorDate: Tue Jan 24 11:59:53 2023 -0600 Merge branch 'cassandra-3.0' into cassandra-3.11 .build/dependency-check-suppressions.xml | 4 CHANGES.txt | 1 + 2 files changed, 5 insertions(+) diff --cc .build/dependency-check-suppressions.xml index 45b8e41835,cfe34b74e5..8c5cf0f592 --- a/.build/dependency-check-suppressions.xml +++ b/.build/dependency-check-suppressions.xml @@@ -23,13 -23,16 +23,17 @@@ ^pkg:maven/org\.yaml/snakeyaml@.*$ -CVE-2022-38752 -CVE-2022-38751 -CVE-2022-38750 -CVE-2022-41854 +CVE-2017-18640 CVE-2022-25857 CVE-2022-38749 +CVE-2022-38750 +CVE-2022-38751 +CVE-2022-38752 +CVE-2022-41854 + CVE-2021-1471 + CVE-2021-3064 + CVE-2021-4235 + CVE-2017-18640 diff --cc CHANGES.txt index fd15a7f770,5600dc17fd..5a59323aa0 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,6 -1,5 +1,7 @@@ -3.0.29 +3.11.15 + * Fix Splitter sometimes creating more splits than requested (CASSANDRA-18013) +Merged from 3.0: + * Suppress CVE-2021-1471, CVE-2021-3064, CVE-2021-4235 (CASSANDRA-18149) * Switch to snakeyaml's SafeConstructor (CASSANDRA-18150) * Expand build.dir property in rat targets (CASSANDRA-18183) * Suppress CVE-2022-41881 (CASSANDRA-18148) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 92245b0f07cda20d08a29bf5912018867ed16779 Merge: f52b316016 e7f55ab8c3 Author: Brandon Williams AuthorDate: Tue Jan 24 06:29:21 2023 -0600 Merge branch 'cassandra-3.0' into cassandra-3.11 CHANGES.txt | 1 + src/java/org/apache/cassandra/config/YamlConfigurationLoader.java | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --cc CHANGES.txt index e159a26677,aec4a679f1..fd15a7f770 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,6 -1,5 +1,7 @@@ -3.0.29 +3.11.15 + * Fix Splitter sometimes creating more splits than requested (CASSANDRA-18013) +Merged from 3.0: + * Switch to snakeyaml's SafeConstructor (CASSANDRA-18150) * Expand build.dir property in rat targets (CASSANDRA-18183) * Suppress CVE-2022-41881 (CASSANDRA-18148) * Default role is created with zero timestamp (CASSANDRA-12525) diff --cc src/java/org/apache/cassandra/config/YamlConfigurationLoader.java index e1930803a0,8376300520..e55ec85109 --- a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java +++ b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java @@@ -121,12 -114,11 +121,12 @@@ public class YamlConfigurationLoader im throw new AssertionError(e); } -SafeConstructor constructor = new CustomConstructor(Config.class); -MissingPropertiesChecker propertiesChecker = new MissingPropertiesChecker(); + - Constructor constructor = new CustomConstructor(Config.class, Yaml.class.getClassLoader()); ++SafeConstructor constructor = new CustomConstructor(Config.class, Yaml.class.getClassLoader()); +PropertiesChecker propertiesChecker = new PropertiesChecker(); constructor.setPropertyUtils(propertiesChecker); Yaml yaml = new Yaml(constructor); -Config result = yaml.loadAs(new ByteArrayInputStream(configBytes), Config.class); +Config result = loadConfig(yaml, configBytes); propertiesChecker.check(); return result; } @@@ -145,8 -136,8 +145,8 @@@ @SuppressWarnings("unchecked") //getSingleData returns Object, not T public static T fromMap(Map map, boolean shouldCheck, Class klass) { - Constructor constructor = new YamlConfigurationLoader.CustomConstructor(klass, klass.getClassLoader()); + SafeConstructor constructor = new YamlConfigurationLoader.CustomConstructor(klass, klass.getClassLoader()); -YamlConfigurationLoader.MissingPropertiesChecker propertiesChecker = new YamlConfigurationLoader.MissingPropertiesChecker(); +YamlConfigurationLoader.PropertiesChecker propertiesChecker = new YamlConfigurationLoader.PropertiesChecker(); constructor.setPropertyUtils(propertiesChecker); Yaml yaml = new Yaml(constructor); Node node = yaml.represent(map); - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into 'cassandra-3.11'
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 6f719f811acec652178ec7c660640e4fc3bd798b Merge: fc3ad6525f fe71dfd7a1 Author: Brandon Williams AuthorDate: Mon Jan 23 06:53:53 2023 -0600 Merge branch 'cassandra-3.0' into 'cassandra-3.11' .build/dependency-check-suppressions.xml | 1 + CHANGES.txt | 1 + 2 files changed, 2 insertions(+) diff --cc CHANGES.txt index fbf0404ebd,7da1d4281f..314734a50e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,6 -1,5 +1,7 @@@ -3.0.29 +3.11.15 + * Fix Splitter sometimes creating more splits than requested (CASSANDRA-18013) +Merged from 3.0: + * Suppress CVE-2022-41881 (CASSANDRA-18148) * Default role is created with zero timestamp (CASSANDRA-12525) * Suppress CVE-2021-37533 (CASSANDRA-18146) * Add to the IntelliJ Git Window issue navigation links to Cassandra's Jira (CASSANDRA-18126) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit d32c52aba72c182fab0c30cf3d32ce723dde582a Merge: de8daabab6 e0e63f4415 Author: Brandon Williams AuthorDate: Tue Jan 17 09:56:50 2023 -0600 Merge branch 'cassandra-3.0' into cassandra-3.11 .build/dependency-check-suppressions.xml | 18 ++ CHANGES.txt | 1 + 2 files changed, 19 insertions(+) diff --cc CHANGES.txt index 8b9c0e0d87,eae6441f83..5b96779807 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,6 -1,5 +1,7 @@@ -3.0.29 +3.11.15 + * Fix Splitter sometimes creating more splits than requested (CASSANDRA-18013) +Merged from 3.0: + * Suppress CVE-2021-37533 (CASSANDRA-18146) * Add to the IntelliJ Git Window issue navigation links to Cassandra's Jira (CASSANDRA-18126) * Avoid anticompaction mixing data from two different time windows with TWCS (CASSANDRA-17970) * Do not spam the logs with MigrationCoordinator not being able to pull schemas (CASSANDRA-18096) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit de8daabab662c23ee186461601226c236b8df5e0 Merge: b8a87abba4 f384e69482 Author: Bereng AuthorDate: Mon Jan 16 07:05:25 2023 +0100 Merge branch 'cassandra-3.0' into cassandra-3.11 .circleci/generate.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 7fe71274d009b18c16f71c7e223eb8f225ed5a8e Merge: 156cc6fedc 69dfed3671 Author: Bereng AuthorDate: Thu Jan 12 07:06:04 2023 +0100 Merge branch 'cassandra-3.0' into cassandra-3.11 .circleci/generate.sh | 1 + 1 file changed, 1 insertion(+) diff --cc .circleci/generate.sh index a40e002da7,ac08687556..15c2849645 --- a/.circleci/generate.sh +++ b/.circleci/generate.sh @@@ -18,7 -18,8 +18,8 @@@ # BASEDIR=`dirname $0` -BASE_BRANCH=cassandra-3.0 +BASE_BRANCH=cassandra-3.11 + set -e die () { - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
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 0767c834162d74bdc857f47615b9e8a5c7e76d5b Merge: baa9d0327f 730b898b74 Author: Marcus Eriksson AuthorDate: Fri Dec 23 14:41:50 2022 +0100 Merge branch 'cassandra-3.0' into cassandra-3.11 CHANGES.txt| 1 + .../compaction/TimeWindowCompactionStrategy.java | 14 test/unit/org/apache/cassandra/MockSchema.java | 19 .../TimeWindowCompactionStrategyTest.java | 25 +- 4 files changed, 54 insertions(+), 5 deletions(-) diff --cc CHANGES.txt index ad25802839,3900ab5b58..ee21b34ebc --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,7 -1,5 +1,8 @@@ -3.0.29 +3.11.15 + * Fix Splitter sometimes creating more splits than requested (CASSANDRA-18013) + +Merged from 3.0: + * Avoid anticompaction mixing data from two different time windows with TWCS (CASSANDRA-17970) * Do not spam the logs with MigrationCoordinator not being able to pull schemas (CASSANDRA-18096) * Fix incorrect resource name in LIST PERMISSION output (CASSANDRA-17848) * Suppress CVE-2022-41854 and similar (CASSANDRA-18083) diff --cc src/java/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategy.java index 74e5f9d95a,5ae1cc784c..bbc9cdf8ee --- a/src/java/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategy.java +++ b/src/java/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategy.java @@@ -376,9 -333,23 +376,23 @@@ public class TimeWindowCompactionStrate LifecycleTransaction txn = cfs.getTracker().tryModify(filteredSSTables, OperationType.COMPACTION); if (txn == null) return null; -return Collections.singleton(new CompactionTask(cfs, txn, gcBefore)); +return Collections.singleton(new TimeWindowCompactionTask(cfs, txn, gcBefore, options.ignoreOverlaps)); } + /** + * TWCS should not group sstables for anticompaction - this can mix new and old data + */ + @Override + public Collection> groupSSTablesForAntiCompaction(Collection sstablesToGroup) + { + Collection> groups = new ArrayList<>(sstablesToGroup.size()); + for (SSTableReader sstable : sstablesToGroup) + { + groups.add(Collections.singleton(sstable)); + } + return groups; + } + @Override @SuppressWarnings("resource") // transaction is closed by AbstractCompactionTask::execute public synchronized AbstractCompactionTask getUserDefinedTask(Collection sstables, int gcBefore) diff --cc test/unit/org/apache/cassandra/MockSchema.java index 2b480d8e3c,5f3198dad0..90c8e4c705 --- a/test/unit/org/apache/cassandra/MockSchema.java +++ b/test/unit/org/apache/cassandra/MockSchema.java @@@ -85,27 -86,18 +85,37 @@@ public class MockSchem return sstable(generation, size, false, cfs); } +public static SSTableReader sstable(int generation, int size, boolean keepRef, ColumnFamilyStore cfs) +{ +return sstable(generation, size, keepRef, generation, generation, cfs); +} + +public static SSTableReader sstableWithLevel(int generation, long firstToken, long lastToken, int level, ColumnFamilyStore cfs) +{ +return sstable(generation, 0, false, firstToken, lastToken, level, cfs); +} + +public static SSTableReader sstableWithLevel(int generation, int size, int level, ColumnFamilyStore cfs) +{ +return sstable(generation, size, false, generation, generation, level, cfs); +} + + public static SSTableReader sstableWithTimestamp(int generation, long timestamp, ColumnFamilyStore cfs) + { -return sstable(generation, 0, false, timestamp, cfs); ++return sstable(generation, 0, false, 0, 1000, 0, Integer.MAX_VALUE, timestamp, cfs); + } + -public static SSTableReader sstable(int generation, int size, boolean keepRef, ColumnFamilyStore cfs) +public static SSTableReader sstable(int generation, int size, boolean keepRef, long firstToken, long lastToken, ColumnFamilyStore cfs) { -return sstable(generation, size, keepRef, System.currentTimeMillis() * 1000, cfs); +return sstable(generation, size, keepRef, firstToken, lastToken, 0, cfs); } +public static SSTableReader sstable(int generation, int size, boolean keepRef, long firstToken, long lastToken, int level, ColumnFamilyStore cfs) ++{ ++return sstable(generation, size, keepRef, firstToken, lastToken, level, Integer.MAX_VALUE, System.currentTimeMillis() * 1000, cfs); ++} + -public static SSTableReader sstable(int generation, int size, boolean keepRef, long timestamp, ColumnFamilyStore cfs) ++public static SSTableReader sstable(int generation, int size, boolean keepRef, long firstToken, lo
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit b7762e2aa276ecf9cad2dd26ee52fe2463ae52db Merge: 5a53c36515 92019df4d8 Author: Brandon Williams AuthorDate: Mon Dec 5 10:02:35 2022 -0600 Merge branch 'cassandra-3.0' into cassandra-3.11 .build/dependency-check-suppressions.xml | 1 + CHANGES.txt | 1 + 2 files changed, 2 insertions(+) diff --cc .build/dependency-check-suppressions.xml index 6ed01952be,d9eea56920..d2ee33617d --- a/.build/dependency-check-suppressions.xml +++ b/.build/dependency-check-suppressions.xml @@@ -23,12 -23,13 +23,13 @@@ ^pkg:maven/org\.yaml/snakeyaml@.*$ -CVE-2022-38752 -CVE-2022-38751 -CVE-2022-38750 -CVE-2022-41854 +CVE-2017-18640 CVE-2022-25857 CVE-2022-38749 -CVE-2017-18640 +CVE-2022-38750 +CVE-2022-38751 +CVE-2022-38752 ++CVE-2022-41854 diff --cc CHANGES.txt index d435a17ab1,296d41f2b2..4223a5cd8d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,19 -1,10 +1,20 @@@ -3.0.29 +3.11.15 + * Fix Splitter sometimes creating more splits than requested (CASSANDRA-18013) + +Merged from 3.0: + * Suppress CVE-2022-41854 and similar (CASSANDRA-18083) * Fix running Ant rat targets without git (CASSANDRA-17974) - * Fix intermittent failure in nodetool toppartitions (CASSANDRA-17254) -3.0.28 +3.11.14 + * Suppress CVE-2022-42003 and CVE-2022-42004 (CASSANDRA-17966) + * Make LongBufferPoolTest insensitive to timing (CASSANDRA-16681) + * Suppress CVE-2022-25857 and other snakeyaml CVEs (CASSANDRA-17907) + * Fix potential IndexOutOfBoundsException in PagingState in mixed mode clusters (CASSANDRA-17840) + * Document usage of closed token intervals in manual compaction (CASSANDRA-17575) + * Creating of a keyspace on insufficient number of replicas should filter out gosspping-only members (CASSANDRA-17759) + * Only use statically defined subcolumns when determining column definition for supercolumn cell (CASSANDRA-14113) +Merged from 3.0: * Harden JMX by resolving beanshooter issues (CASSANDRA-17921) * Suppress CVE-2019-2684 (CASSANDRA-17965) * Fix auto-completing "WITH" when creating a materialized view (CASSANDRA-17879) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit a44209cf4314a59f49884f5e35b201af5a200d37 Merge: 9213335f59 d9ef794ef6 Author: Mick Semb Wever AuthorDate: Thu Nov 10 14:40:10 2022 +0100 Merge branch 'cassandra-3.0' into cassandra-3.11 * cassandra-3.0: Upgrade Cython, minimum required now is 0.27.2 pylib/cassandra-cqlsh-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 7b7762826e367b2a82ba1e99b12f8f19c583b920 Merge: f9b2cd6f3f 955231cacf Author: Andrés de la Peña AuthorDate: Tue Nov 8 17:48:29 2022 + Merge branch 'cassandra-3.0' into cassandra-3.11 .circleci/config.yml.HIGHRES | 104 --- .circleci/config.yml.LOWRES | 104 --- .circleci/config.yml.MIDRES | 104 --- .circleci/generate.sh| 95 ++- 4 files changed, 54 insertions(+), 353 deletions(-) diff --cc .circleci/config.yml.HIGHRES index 2f1e95a979,c5f23bd782..5c55e714c8 --- a/.circleci/config.yml.HIGHRES +++ b/.circleci/config.yml.HIGHRES @@@ -3004,48 -2402,12 +2992,24 @@@ workflows requires: - start_utests_long - build - - start_utests_long_repeat: - type: approval - - utests_long_repeat: - requires: - - start_utests_long_repeat - - build +- start_utests_cdc: +type: approval +- utests_cdc: +requires: +- start_utests_cdc +- build - - start_utests_cdc_repeat: - type: approval - - utests_cdc_repeat: - requires: - - start_utests_cdc_repeat - - build - start_utests_compression: type: approval - utests_compression: requires: - start_utests_compression - build - - start_utests_compression_repeat: - type: approval - - utests_compression_repeat: - requires: - - start_utests_compression_repeat - - build +- start_utests_stress: +type: approval +- utests_stress: +requires: +- start_utests_stress +- build - - start_utests_stress_repeat: - type: approval - - utests_stress_repeat: - requires: - - start_utests_stress_repeat - - build - start_j8_dtest_jars_build: type: approval - j8_dtest_jars_build: @@@ -3082,30 -2432,12 +3034,12 @@@ requires: - start_j8_dtests_vnode - build - - start_j8_dtests_vnode_repeat: - type: approval - - j8_dtests_vnode_repeat: - requires: - - start_j8_dtests_vnode_repeat - - build -- start_j8_upgrade_dtests: +- start_upgrade_dtests: type: approval - j8_upgrade_dtests: requires: -- start_j8_upgrade_dtests +- start_upgrade_dtests - build - - start_j8_upgrade_dtests_repeat: - type: approval - - j8_upgrade_dtests_repeat: - requires: - - start_j8_upgrade_dtests_repeat - - build - - start_j8_repeated_ant_test: - type: approval - - j8_repeated_ant_test: - requires: - - start_j8_repeated_ant_test - - build pre-commit_tests: jobs: - start_pre-commit_tests: @@@ -3131,40 -2457,12 +3059,24 @@@ requires: - start_utests_long - build - - utests_long_repeat: - requires: - - start_utests_long - - build +- start_utests_cdc: +type: approval +- utests_cdc: +requires: +- start_utests_cdc +- build - - utests_cdc_repeat: - requires: - - start_utests_cdc - - build - start_utests_compression: type: approval - utests_compression: requires: - start_utests_compression - build - - utests_compression_repeat: - requires: - - start_utests_compression - - build +- start_utests_stress: +type: approval +- utests_stress: +requires: +- start_utests_stress +- build - - utests_stress_repeat: - requires: - - start_utests_stress - - build - start_jvm_upgrade_dtests: type: approval - j8_dtest_jars_build: @@@ -3183,22 -2478,9 +3092,9 @@@ - j8_dtests_vnode: requires: - build - - j8_dtests_vnode_repeat: - requires: - - build -- start_upgrade_dtests: +- start_upgrade_tests: type: approval - j8_upgrade_dtests: requires: -- start_upgrade_dtests +- start_upgrade_tests - build - - j8_upgrade_dtests_repeat: - requires: - - start_upgrade_tests - - build - - j8_repeated_ant_test: - requires: - - build diff --cc .circleci/config.yml.LOWRES index dbfc0855dd,1141a9c923..30046af3ca --- a/.circleci/config.yml.LOWRES +++ b/.circleci/config.yml.LOWRES @@@ -3004,48 -2402,12 +2992,24 @@@ workflows requires: - start_utests_long - build - -
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit f9b2cd6f3f1bdfa775b6e8bde7e5b22dc6e60d0b Merge: bdd6606486 30a3266780 Author: Mick Semb Wever AuthorDate: Sat Nov 5 15:50:56 2022 +0100 Merge branch 'cassandra-3.0' into cassandra-3.11 * cassandra-3.0: ninja-fix antcall maybe-build-test needs inheritRefs (CASSANDRA-18000) build.xml | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --cc build.xml index c326f7992e,965ff8640d..5e15f4923d --- a/build.xml +++ b/build.xml @@@ -777,27 -749,6 +777,27 @@@ + + + + + - ++ + + + + + - ++ + + + + @@@ -925,7 -921,15 +925,7 @@@ - @@@ -1101,12 -1081,11 +1101,12 @@@ See CASSANDRA-16625 and CASSANDRA-18000 for further details. --> - + -- ++
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit bdd6606486e91024e123afc4e56465a95b102d1a Merge: 43dcb5cd14 95400649d8 Author: Andrés de la Peña AuthorDate: Fri Nov 4 16:25:25 2022 + Merge branch 'cassandra-3.0' into cassandra-3.11 .circleci/config-2_1.yml | 4 +-- .circleci/config.yml | 14 +- .circleci/config.yml.HIGHRES | 14 +- .circleci/config.yml.LOWRES | 14 +- .circleci/config.yml.MIDRES | 14 +- build.xml| 66 +++- 6 files changed, 71 insertions(+), 55 deletions(-) diff --cc .circleci/config-2_1.yml index d1b2e1a05c,faa703a896..04dec86f9c --- a/.circleci/config-2_1.yml +++ b/.circleci/config-2_1.yml @@@ -856,7 -773,7 +856,7 @@@ commands if [ -d ~/dtest_jars ]; then cp ~/dtest_jars/dtest* /tmp/cassandra/build/ fi - ant <> -Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt -Dtest.classlistprefix=<> - ant clean <> -Dno-build-test=true ++ ant <> -Dtest.classlistfile=/tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt -Dtest.classlistprefix=<> -Dno-build-test=true no_output_timeout: <> - store_test_results: path: /tmp/cassandra/build/test/output/ diff --cc .circleci/config.yml index 10ee3ca134,1141a9c923..30046af3ca --- a/.circleci/config.yml +++ b/.circleci/config.yml @@@ -1427,189 -1220,13 +1427,189 @@@ jobs - store_test_results: path: /tmp/results/repeated_utests/output - store_artifacts: -path: /tmp/results/repeated_utests/stdout -destination: stdout +path: /tmp/results/repeated_utests/stdout +destination: stdout +- store_artifacts: +path: /tmp/results/repeated_utests/output +destination: junitxml +- store_artifacts: +path: /tmp/results/repeated_utests/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: https://github.com/apache/cassandra-dtest.git +- DTEST_BRANCH: trunk +- CCM_MAX_HEAP_SIZE: 1024M +- CCM_HEAP_NEWSIZE: 256M +- REPEATED_TESTS_STOP_ON_FAILURE: false +- REPEATED_UTESTS: null +- REPEATED_UTESTS_COUNT: 500 +- REPEATED_UTESTS_LONG: null +- REPEATED_UTESTS_LONG_COUNT: 100 +- REPEATED_UTESTS_STRESS: null +- REPEATED_UTESTS_STRESS_COUNT: 500 +- REPEATED_JVM_DTESTS: null +- REPEATED_JVM_DTESTS_COUNT: 500 +- REPEATED_JVM_UPGRADE_DTESTS: null +- REPEATED_JVM_UPGRADE_DTESTS_COUNT: 500 +- REPEATED_DTESTS: null +- REPEATED_DTESTS_COUNT: 500 +- REPEATED_UPGRADE_DTESTS: null +- REPEATED_UPGRADE_DTESTS_COUNT: 25 +- REPEATED_ANT_TEST_TARGET: testsome +- REPEATED_ANT_TEST_CLASS: null +- REPEATED_ANT_TEST_METHODS: null +- REPEATED_ANT_TEST_COUNT: 500 +- JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64 +- JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64 + utests_cdc: +docker: +- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest +resource_class: medium +working_directory: ~/ +shell: /bin/bash -eo pipefail -l +parallelism: 4 +steps: +- attach_workspace: +at: /home/cassandra +- run: +name: Determine unit Tests to Run +command: | + # reminder: this code (along with all the steps) is independently executed on every circle container + # so the goal here is to get the circleci script to return the tests *this* container will run + # which we do via the `circleci` cli tool. + + rm -fr ~/cassandra-dtest/upgrade_tests + echo "***java tests***" + + # get all of our unit test filenames + set -eo pipefail && circleci tests glob "$HOME/cassandra/test/unit/**/*.java" > /tmp/all_java_unit_tests.txt + + # split up the unit tests into groups based on the number of containers we have + set -eo pipefail && circleci tests split --split-by=timings --timings-type=filename --index=${CIRCLE_NODE_INDEX} --total=${CIRCLE_NODE_TOTAL} /tmp/all_java_unit_tests.txt > /tmp/java_tests_${CIRCLE_NODE_INDEX}.txt + set -eo pipefail && cat /tmp/java_tests_${CIRCLE_NODE_INDEX}.txt | sed "s;^/home/cassandra/cassandra/test/unit/;;g" | grep "Test\.java$" > /tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt + echo "** /tmp/java_tests_${CIRCLE_NODE_INDEX}_final.txt" + cat /tmp/
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit b82dca6f81f67994af2e62f4cfd74a74ddbb45ca Merge: 7df905a429 e0331f631e Author: Brandon Williams AuthorDate: Thu Nov 3 08:07:57 2022 -0500 Merge branch 'cassandra-3.0' into cassandra-3.11 - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 7df905a4293af692b793b9364f2011f1c0a3a0d9 Merge: deede44af5 116ce3bc05 Author: Andrés de la Peña AuthorDate: Thu Nov 3 11:36:22 2022 + Merge branch 'cassandra-3.0' into cassandra-3.11 .circleci/config-2_1.yml| 70 -- .circleci/config-2_1.yml.high_res.patch | 6 +- .circleci/config-2_1.yml.mid_res.patch | 12 +- .circleci/config.yml| 403 +-- .circleci/config.yml.HIGHRES| 413 ++-- .circleci/config.yml.LOWRES | 413 ++-- .circleci/config.yml.MIDRES | 413 ++-- .circleci/generate.sh | 1 + 8 files changed, 1606 insertions(+), 125 deletions(-) diff --cc .circleci/config-2_1.yml index c3703d699d,48bce92a3a..92dd98d332 --- a/.circleci/config-2_1.yml +++ b/.circleci/config-2_1.yml @@@ -109,7 -101,7 +109,6 @@@ default_env_vars: &default_env_var # REPEATED_ANT_TEST_TARGET: test-jvm-dtest-some # REPEATED_ANT_TEST_TARGET: test-cdc # REPEATED_ANT_TEST_TARGET: test-compression --# REPEATED_ANT_TEST_TARGET: test-system-keyspace-directory REPEATED_ANT_TEST_TARGET: testsome # The name of JUnit class to be run multiple times, for example: # REPEATED_ANT_TEST_CLASS: org.apache.cassandra.cql3.ViewTest @@@ -199,7 -191,7 +198,7 @@@ separate_jobs: &separate_job requires: - start_j8_jvm_dtests_repeat - build --# specialized unit tests (all run using Java 8) ++# specialized unit tests (all run on request) - start_utests_long: type: approval - utests_long: @@@ -212,6 -204,6 +211,18 @@@ requires: - start_utests_long_repeat - build ++- start_utests_cdc: ++type: approval ++- utests_cdc: ++requires: ++ - start_utests_cdc ++ - build ++- start_utests_cdc_repeat: ++type: approval ++- utests_cdc_repeat: ++requires: ++ - start_utests_cdc_repeat ++ - build - start_utests_compression: type: approval - utests_compression: @@@ -320,7 -301,7 +331,7 @@@ pre-commit_jobs: &pre-commit_job - j8_jvm_dtests_repeat: requires: - build --# specialized unit tests (all run on request using Java 8) ++# specialized unit tests (all run on request) - start_utests_long: type: approval - utests_long: @@@ -331,6 -312,6 +342,16 @@@ requires: - start_utests_long - build ++- start_utests_cdc: ++type: approval ++- utests_cdc: ++requires: ++ - start_utests_cdc ++ - build ++- utests_cdc_repeat: ++requires: ++ - start_utests_cdc ++ - build - start_utests_compression: type: approval - utests_compression: @@@ -481,6 -448,6 +502,16 @@@ jobs - run_junit_tests: target: long-test ++ utests_cdc: ++<<: *j8_par_executor ++steps: ++ - attach_workspace: ++ at: /home/cassandra ++ - create_junit_containers ++ - log_environment ++ - run_parallel_junit_tests: ++ target: testclasslist-cdc ++ utests_compression: <<: *j8_par_executor steps: @@@ -552,21 -511,21 +583,21 @@@ - log_environment - run_unit_tests_repeat -- utests_compression_repeat: ++ utests_cdc_repeat: <<: *j8_repeated_utest_executor steps: - attach_workspace: at: /home/cassandra - log_environment -- - run_utests_compression_repeat ++ - run_utests_cdc_repeat -- utests_system_keyspace_directory_repeat: ++ utests_compression_repeat: <<: *j8_repeated_utest_executor steps: - attach_workspace: at: /home/cassandra - log_environment -- - run_utests_system_keyspace_directory_repeat ++ - run_utests_compression_repeat utests_long_repeat: <<: *j8_repeated_utest_executor @@@ -984,18 -932,18 +1015,18 @@@ commands count: ${REPEATED_UTESTS_COUNT} stop_on_failure: ${REPEATED_TESTS_STOP_ON_FAILURE} -- run_utests_compression_repeat: ++ run_utests_cdc_repeat: steps: - run_repeated_utests: -- target: test-compression ++ target: test-cdc tests: ${REPEATED_UTESTS} count: ${REPEATED_UTESTS_COUNT} stop_on_failure: ${REPEATED_TESTS_STOP_ON_FAILURE} -- run_utests_system_keyspace_directory_repeat: ++ run_utests_compression_repeat: steps: - run_repeated_utests: -- target: test-system-keyspace-directory ++ target: test-compression tests: ${REPEATED_UTESTS}
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit deede44af5b0d8d6ec19ecf1e613544262d85144 Merge: ed07f7d6bc ccc0b14d56 Author: Andrés de la Peña AuthorDate: Fri Oct 28 13:54:23 2022 +0100 Merge branch 'cassandra-3.0' into cassandra-3.11 .circleci/generate.sh | 1 + 1 file changed, 1 insertion(+) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit ed07f7d6bc3e2185997f8e0180b9643bcbf57543 Merge: 761d9f9516 a3b4119b5a Author: Mick Semb Wever AuthorDate: Sun Oct 23 23:19:59 2022 +0200 Merge branch 'cassandra-3.0' into cassandra-3.11 * cassandra-3.0: Increment versions to 3.0.29, 3.11.15, 4.0.8 CHANGES.txt | 6 +- build.xml| 2 +- debian/changelog | 6 ++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --cc CHANGES.txt index 0fbc61ba67,bd78e9207c..005d97f1fb --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,8 +1,17 @@@ -3.0.29 ++3.11.15 ++Merged from 3.0: + * Fix running Ant rat targets without git (CASSANDRA-17974) + + -3.0.28 +3.11.14 + * Suppress CVE-2022-42003 and CVE-2022-42004 (CASSANDRA-17966) + * Make LongBufferPoolTest insensitive to timing (CASSANDRA-16681) + * Suppress CVE-2022-25857 and other snakeyaml CVEs (CASSANDRA-17907) + * Fix potential IndexOutOfBoundsException in PagingState in mixed mode clusters (CASSANDRA-17840) + * Document usage of closed token intervals in manual compaction (CASSANDRA-17575) + * Creating of a keyspace on insufficient number of replicas should filter out gosspping-only members (CASSANDRA-17759) + * Only use statically defined subcolumns when determining column definition for supercolumn cell (CASSANDRA-14113) +Merged from 3.0: - * Fix running Ant rat targets without git (CASSANDRA-17974) * Harden JMX by resolving beanshooter issues (CASSANDRA-17921) * Suppress CVE-2019-2684 (CASSANDRA-17965) * Fix auto-completing "WITH" when creating a materialized view (CASSANDRA-17879) diff --cc build.xml index 5745483b28,ef684efcb9..b722e13074 --- a/build.xml +++ b/build.xml @@@ -33,7 -33,7 +33,7 @@@ - - ++ https://gitbox.apache.org/repos/asf/cassandra.git"/> https://gitbox.apache.org/repos/asf/cassandra.git"/> https://gitbox.apache.org/repos/asf?p=cassandra.git;a=tree"/> diff --cc debian/changelog index 8aa938d7e8,99743d66a5..c895b9fe57 --- a/debian/changelog +++ b/debian/changelog @@@ -1,4 -1,10 +1,10 @@@ -cassandra (3.0.29) UNRELEASED; urgency=medium ++cassandra (3.11.15) UNRELEASED; urgency=medium + + * New release + - -- Mick Semb Wever Wed, 19 Oct 2022 09:58:43 +0200 ++ -- Mick Semb Wever Wed, 19 Oct 2022 10:27:23 +0200 + -cassandra (3.0.28) unstable; urgency=medium +cassandra (3.11.14) unstable; urgency=medium * New release - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit c7d665dcc7c06120c6c149a7b9fda27b8ea13b67 Merge: d465ac2dc9 2b511c5714 Author: Andrés de la Peña AuthorDate: Wed Oct 19 12:48:49 2022 +0100 Merge branch 'cassandra-3.0' into cassandra-3.11 .circleci/generate.sh | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) diff --cc .circleci/generate.sh index 54db165eff,4ea520b786..135f909620 --- a/.circleci/generate.sh +++ b/.circleci/generate.sh @@@ -249,13 -244,10 +249,13 @@@ if (! (echo "$env_vars" | grep -q "REPE delete_job "utests_compression_repeat" delete_job "utests_system_keyspace_directory_repeat" fi - if [[ $env_vars != *"REPEATED_UTESTS_LONG="* ]]; then + if (! (echo "$env_vars" | grep -q "REPEATED_UTESTS_LONG=")); then delete_job "utests_long_repeat" fi - if [[ $env_vars != *"REPEATED_UTESTS_STRESS="* ]]; then ++if (! (echo "$env_vars" | grep -q "REPEATED_UTESTS_STRESS=")); then + delete_job "utests_stress_repeat" +fi - if [[ $env_vars != *"REPEATED_JVM_DTESTS="* ]]; then + if (! (echo "$env_vars" | grep -q "REPEATED_JVM_DTESTS=")); then delete_job "j8_jvm_dtests_repeat" delete_job "j8_jvm_dtests_vnode_repeat" delete_job "j11_jvm_dtests_repeat" - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit d465ac2dc93f494b9585d7ef6789278c6c987243 Merge: 9d3327ef13 96c5332ee1 Author: Mick Semb Wever AuthorDate: Wed Oct 19 11:32:23 2022 +0200 Merge branch 'cassandra-3.0' into cassandra-3.11 * cassandra-3.0: Prepare debian changelog for 3.0.28 - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 95d0a936f9611e6c43b79f6e4ba470c27d384567 Merge: 6b0cd7db04 b2660bcf78 Author: Mick Semb Wever AuthorDate: Tue Oct 18 22:49:07 2022 +0200 Merge branch 'cassandra-3.0' into cassandra-3.11 * cassandra-3.0: Fix JMX security vulnerabilities CHANGES.txt| 1 + ide/idea/workspace.xml | 2 +- .../cassandra/auth/jmx/AuthorizationProxy.java | 70 ++ 3 files changed, 72 insertions(+), 1 deletion(-) diff --cc CHANGES.txt index 830dca3b50,799d0b11d9..3e0ab807ec --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,12 -1,5 +1,13 @@@ -3.0.28 +3.11.14 + * Suppress CVE-2022-42003 and CVE-2022-42004 (CASSANDRA-17966) + * Make LongBufferPoolTest insensitive to timing (CASSANDRA-16681) + * Suppress CVE-2022-25857 and other snakeyaml CVEs (CASSANDRA-17907) + * Fix potential IndexOutOfBoundsException in PagingState in mixed mode clusters (CASSANDRA-17840) + * Document usage of closed token intervals in manual compaction (CASSANDRA-17575) + * Creating of a keyspace on insufficient number of replicas should filter out gosspping-only members (CASSANDRA-17759) + * Only use statically defined subcolumns when determining column definition for supercolumn cell (CASSANDRA-14113) +Merged from 3.0: + * Harden JMX by resolving beanshooter issues (CASSANDRA-17921) * Suppress CVE-2019-2684 (CASSANDRA-17965) * Fix auto-completing "WITH" when creating a materialized view (CASSANDRA-17879) * Fix scrubber falling into infinite loop when the last partition is broken (CASSANDRA-17862) diff --cc ide/idea/workspace.xml index 6c6eb69e68,a3fda6ac5d..f98c858f72 --- a/ide/idea/workspace.xml +++ b/ide/idea/workspace.xml @@@ -186,7 -188,7 +186,7 @@@ - ++ diff --cc src/java/org/apache/cassandra/auth/jmx/AuthorizationProxy.java index ebc1763cce,65f7d20202..f2665085f3 --- a/src/java/org/apache/cassandra/auth/jmx/AuthorizationProxy.java +++ b/src/java/org/apache/cassandra/auth/jmx/AuthorizationProxy.java @@@ -21,13 -21,8 +21,14 @@@ package org.apache.cassandra.auth.jmx import java.lang.reflect.*; import java.security.AccessControlContext; import java.security.AccessController; +import java.security.Principal; +import java.util.Set; +import java.util.function.Function; +import java.util.function.Supplier; +import java.util.stream.Collectors; + import javax.management.InstanceNotFoundException; import javax.management.MBeanServer; +import javax.management.MalformedObjectNameException; import javax.management.ObjectName; import javax.security.auth.Subject; @@@ -457,37 -103,68 +462,102 @@@ public class AuthorizationProxy impleme } } +/** + * Query the configured IAuthorizer for the set of all permissions granted on JMXResources to a specific subject + * @param subject + * @return All permissions granted to the specfied subject (including those transitively inherited from + * any roles the subject has been granted), filtered to include only permissions granted on + * JMXResources + */ +private static Set loadPermissions(RoleResource subject) +{ +// get all permissions for the specified subject. We'll cache them as it's likely +// we'll receive multiple lookups for the same subject (but for different resources +// and permissions) in quick succession +return DatabaseDescriptor.getAuthorizer().list(AuthenticatedUser.SYSTEM_USER, Permission.ALL, null, subject) + .stream() + .filter(details -> details.resource instanceof JMXResource) + .collect(Collectors.toSet()); +} + + private void checkVulnerableMethods(Object args[]) + { + assert args.length == 4; + ObjectName name; + String operationName; + Object[] params; + String[] signature; + try + { + name = (ObjectName) args[0]; + operationName = (String) args[1]; + params = (Object[]) args[2]; + signature = (String[]) args[3]; + } + catch (ClassCastException cce) + { + logger.warn("Could not interpret arguments to check vulnerable MBean invocations; did the MBeanServer interface change?", cce); + return; + } + + // When adding compiler directives from a file, most JDKs will log the file contents if invalid, which + // leads to an arbitrary file read vulnerability + checkCompilerDirectiveAddMethods(name, operationName); + + // Loading arbitrary (JVM an
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 6b0cd7db043095904c500660a36ae27826f693a7 Merge: f13cdddcad 3d4e6944ef Author: Brandon Williams AuthorDate: Tue Oct 18 11:08:02 2022 -0500 Merge branch 'cassandra-3.0' into cassandra-3.11 .build/dependency-check-suppressions.xml | 1 + CHANGES.txt | 1 + 2 files changed, 2 insertions(+) diff --cc CHANGES.txt index cbe38d02b3,7dd28c8a84..830dca3b50 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,12 -1,5 +1,13 @@@ -3.0.28 +3.11.14 + * Suppress CVE-2022-42003 and CVE-2022-42004 (CASSANDRA-17966) + * Make LongBufferPoolTest insensitive to timing (CASSANDRA-16681) + * Suppress CVE-2022-25857 and other snakeyaml CVEs (CASSANDRA-17907) + * Fix potential IndexOutOfBoundsException in PagingState in mixed mode clusters (CASSANDRA-17840) + * Document usage of closed token intervals in manual compaction (CASSANDRA-17575) + * Creating of a keyspace on insufficient number of replicas should filter out gosspping-only members (CASSANDRA-17759) + * Only use statically defined subcolumns when determining column definition for supercolumn cell (CASSANDRA-14113) +Merged from 3.0: + * Suppress CVE-2019-2684 (CASSANDRA-17965) * Fix auto-completing "WITH" when creating a materialized view (CASSANDRA-17879) * Fix scrubber falling into infinite loop when the last partition is broken (CASSANDRA-17862) * Improve libjemalloc resolution in bin/cassandra (CASSANDRA-15767) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 6838fc552dd5149d01e7cb7a05178c0c8d2a164d Merge: b492341eb5 9e32c44455 Author: Brandon Williams AuthorDate: Thu Aug 18 05:55:42 2022 -0500 Merge branch 'cassandra-3.0' into cassandra-3.11 build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --cc build.xml index 5e6d54681e,db0eacef80..a86ce1a260 --- a/build.xml +++ b/build.xml @@@ -913,7 -921,15 +913,7 @@@ - - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit eb5eda76c5b3110bb86b687da64bb99965af0fbb Merge: afaeb93020 299bfaed35 Author: Andrés de la Peña AuthorDate: Mon Aug 8 13:53:52 2022 +0100 Merge branch 'cassandra-3.0' into cassandra-3.11 - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 34dce0066d934970ae5c082ca1a555dd009ab97a Merge: 51fb85a9db 5ed63e0a5a Author: Brandon Williams AuthorDate: Tue Jun 21 09:46:26 2022 -0500 Merge branch 'cassandra-3.0' into cassandra-3.11 .build/dependency-check-suppressions.xml | 1 + CHANGES.txt | 1 + 2 files changed, 2 insertions(+) diff --cc CHANGES.txt index d796eb9449,2a7f785ac3..4d52448919 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,5 -1,5 +1,6 @@@ -3.0.28 +3.11.14 +Merged from 3.0: + * Supress CVE-2020-7238 (CASSANDRA-17697) * Fix issue where frozen maps may not be serialized in the correct order (CASSANDRA-17623) * Suppress CVE-2022-24823 (CASSANDRA-17633) * fsync TOC and digest files (CASSANDRA-10709) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 51fb85a9db05efac231630e0e3621a6aa65483b6 Merge: f884dda75b 87bdbb7182 Author: Mick Semb Wever AuthorDate: Sun Jun 19 16:39:18 2022 +0200 Merge branch 'cassandra-3.0' into cassandra-3.11 .jenkins/Jenkinsfile | 45 ++--- 1 file changed, 30 insertions(+), 15 deletions(-) diff --cc .jenkins/Jenkinsfile index 31f06d280d,4ea5de3e8a..75b9a66cbb --- a/.jenkins/Jenkinsfile +++ b/.jenkins/Jenkinsfile @@@ -47,34 -48,8 +47,35 @@@ pipeline } } } - stage('Test') { +} +stage('Test') { parallel { + stage('stress') { +steps { + script { +def attempt = 1 - retry(2) { ++while (attempt <=2) { + if (attempt > 1) { +sleep(60 * attempt) + } + attempt = attempt + 1 + stress = build job: "${env.JOB_NAME}-stress-test", propagate: false ++ if (stress.result != 'FAILURE') break +} +if (stress.result != 'SUCCESS') unstable('stress test failures') +if (stress.result == 'FAILURE') currentBuild.result='FAILURE' + } +} +post { + always { + warnError('missing test xml files') { + script { + copyTestResults('stress-test', stress.getNumber()) + } + } + } +} + } stage('units') { steps { script { @@@ -150,31 -128,6 +154,32 @@@ } } } + stage('cdc') { +steps { + script { +def attempt = 1 - retry(2) { ++while (attempt <=2) { + if (attempt > 1) { +sleep(60 * attempt) + } + attempt = attempt + 1 + cdc = build job: "${env.JOB_NAME}-test-cdc", propagate: false ++ if (cdc.result != 'FAILURE') break +} +if (cdc.result != 'SUCCESS') unstable('cdc failures') +if (cdc.result == 'FAILURE') currentBuild.result='FAILURE' + } +} +post { + always { + warnError('missing test xml files') { + script { + copyTestResults('test-cdc', cdc.getNumber()) + } + } + } +} + } stage('compression') { steps { script { @@@ -354,31 -314,6 +366,32 @@@ } } } + stage('dtest-offheap') { +steps { + script { +def attempt = 1 - retry(2) { ++while (attempt <=2) { + if (attempt > 1) { +sleep(60 * attempt) + } + attempt = attempt + 1 + dtest_offheap = build job: "${env.JOB_NAME}-dtest-offheap", propagate: false ++ if (dtest_offheap.result != 'FAILURE') break +} +if (dtest_offheap.result != 'SUCCESS') unstable('dtest-offheap failures') +if (dtest_offheap.result == 'FAILURE') currentBuild.result='FAILURE' + } +} +post { + always { +warnError('missing test xml files') { +script { +copyTestResults('dtest-offheap', dtest_offheap.getNumber()) +} +} + } +} + } stage('dtest-large-novnode') { steps { script { - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. jonmeredith pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit c9a7269874032381dfebeee61073e1a37378f49c Merge: 8a9ba8866d ba0555e965 Author: Jon Meredith AuthorDate: Mon Jun 6 11:04:41 2022 -0600 Merge branch 'cassandra-3.0' into cassandra-3.11 .../distributed/test/MessageForwardingTest.java | 20 1 file changed, 20 insertions(+) diff --cc test/distributed/org/apache/cassandra/distributed/test/MessageForwardingTest.java index 61ccb5fcf3,cc54711d8d..895772364c --- a/test/distributed/org/apache/cassandra/distributed/test/MessageForwardingTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/MessageForwardingTest.java @@@ -66,6 -73,21 +71,21 @@@ public class MessageForwardingTest exte //noinspection ResultOfMethodCallIgnored inserts.map(IsolatedExecutor::waitOn).count(); + // Tracing is async with respect to queries, just because the query has completed it does not mean + // all tracing updates have completed. The tracing executor serializes work, so run a task through + // and everthing submitted before must have completed. + cluster.forEach(instance -> instance.runOnInstance(() -> { -Future result = StageManager.getStage(Stage.TRACING).submit(NO_OP_TASK); ++Future result = StageManager.getStage(Stage.TRACING).submit(() -> null); + try + { + result.get(30, TimeUnit.SECONDS); + } + catch (ExecutionException | InterruptedException | TimeoutException ex) + { + throw new RuntimeException(ex); + } + })); + cluster.forEach(instance -> commitCounts.put(instance.broadcastAddress().getAddress(), 0)); List traces = TracingUtil.getTrace(cluster, sessionId, ConsistencyLevel.ALL); traces.forEach(traceEntry -> { - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit bb0e63fc389f59b98713b762ecd49e9021b1c66f Merge: 76648a6534 2b533b28c2 Author: Mick Semb Wever AuthorDate: Sat May 28 13:54:13 2022 +0200 Merge branch 'cassandra-3.0' into cassandra-3.11 .jenkins/Jenkinsfile | 237 ++- 1 file changed, 178 insertions(+), 59 deletions(-) diff --cc .jenkins/Jenkinsfile index df708ccb0e,ca4a0c7f24..31f06d280d --- a/.jenkins/Jenkinsfile +++ b/.jenkins/Jenkinsfile @@@ -26,72 -26,30 +26,55 @@@ pipeline { agent { label 'cassandra' } stages { - stage('Init') { +stage('Init') { steps { - cleanWs() + cleanWs() + script { + currentBuild.result='SUCCESS' + } } - } - stage('Build') { -steps { - script { -def attempt = 1 -retry(2) { - if (attempt > 1) { -sleep(60 * attempt) - } - attempt = attempt + 1 - build job: "${env.JOB_NAME}-artifacts" +} +stage('Build') { - steps { - build job: "${env.JOB_NAME}-artifacts" ++ steps { ++script { ++ def attempt = 1 ++ retry(2) { ++if (attempt > 1) { ++ sleep(60 * attempt) + } ++attempt = attempt + 1 ++ build job: "${env.JOB_NAME}-artifacts" + } } + } - stage('Test') { +} +stage('Test') { parallel { + stage('stress') { - steps { - script { - stress = build job: "${env.JOB_NAME}-stress-test", propagate: false - if (stress.result != 'SUCCESS') unstable('stress test failures') - if (stress.result == 'FAILURE') currentBuild.result='FAILURE' - } - } - post { - always { - warnError('missing test xml files') { - script { - copyTestResults('stress-test', stress.getNumber()) - } - } - } - } - } - stage('jvm-dtest') { +steps { + script { - jvm_dtest = build job: "${env.JOB_NAME}-jvm-dtest", propagate: false - if (jvm_dtest.result != 'SUCCESS') unstable('jvm-dtest failures') - if (jvm_dtest.result == 'FAILURE') currentBuild.result='FAILURE' - } - } - post { - always { - warnError('missing test xml files') { - script { - copyTestResults('jvm-dtest', jvm_dtest.getNumber()) - } ++def attempt = 1 ++retry(2) { ++ if (attempt > 1) { ++sleep(60 * attempt) + } - } - } - } - stage('jvm-dtest-upgrade') { - steps { - script { - jvm_dtest_upgrade = build job: "${env.JOB_NAME}-jvm-dtest-upgrade", propagate: false - if (jvm_dtest_upgrade.result != 'SUCCESS') unstable('jvm-dtest-upgrade failures') - if (jvm_dtest_upgrade.result == 'FAILURE') currentBuild.result='FAILURE' ++ attempt = attempt + 1 ++ stress = build job: "${env.JOB_NAME}-stress-test", propagate: false ++} ++if (stress.result != 'SUCCESS') unstable('stress test failures') ++if (stress.result == 'FAILURE') currentBuild.result='FAILURE' + } +} +post { + always { + warnError('missing test xml files') { + script { - copyTestResults('jvm-dtest-upgrade', jvm_dtest_upgrade.getNumber()) ++ copyTestResults('stress-test', stress.getNumber()) + } + } + } +} + } stage('units') { steps { script { @@@ -146,24 -125,6 +150,31 @@@ } } } + stage('cdc') { +steps { + script { - cdc = build job: "${env.JOB_NAME}-test-cdc", propagate: false ++def attempt = 1 ++retry(2) { ++ if (attempt > 1) { ++sleep(60 * attempt) ++ } ++ attempt = attempt + 1 ++ cdc = build job: "${env.JOB_NAME}-test-cdc", propagate: false ++} +
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. dcapwell pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 76648a6534845765e5f79db5d7a9f60ec347c98b Merge: 0e1d068d92 fb8bf30c6d Author: David Capwell AuthorDate: Wed May 25 14:00:18 2022 -0700 Merge branch 'cassandra-3.0' into cassandra-3.11 src/java/org/apache/cassandra/net/PingMessage.java | 18 +- 1 file changed, 13 insertions(+), 5 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 0e1d068d9237de39b53992522eba4b40afb0e72b Merge: 01ebd9936f ffc4c89c3d Author: Andrés de la Peña AuthorDate: Fri May 20 11:43:56 2022 +0100 Merge branch 'cassandra-3.0' into cassandra-3.11 CHANGES.txt| 1 + src/java/org/apache/cassandra/cql3/Maps.java | 11 +- src/java/org/apache/cassandra/cql3/Sets.java | 2 +- test/unit/org/apache/cassandra/cql3/CQLTester.java | 29 +++- .../apache/cassandra/cql3/ColumnConditionTest.java | 2 +- .../cql3/validation/entities/CollectionsTest.java | 74 + .../cassandra/io/sstable/CQLSSTableWriterTest.java | 171 + 7 files changed, 282 insertions(+), 8 deletions(-) diff --cc CHANGES.txt index 689fbfd2ba,c49c33224f..d796eb9449 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,5 -1,5 +1,6 @@@ -3.0.28 +3.11.14 +Merged from 3.0: + * Fix issue where frozen maps may not be serialized in the correct order (CASSANDRA-17623) * Suppress CVE-2022-24823 (CASSANDRA-17633) * fsync TOC and digest files (CASSANDRA-10709) diff --cc test/unit/org/apache/cassandra/cql3/CQLTester.java index 705fad8f1f,fe8ed5b9c3..996cfc8d5e --- a/test/unit/org/apache/cassandra/cql3/CQLTester.java +++ b/test/unit/org/apache/cassandra/cql3/CQLTester.java @@@ -31,7 -31,10 +31,9 @@@ import java.util.concurrent.atomic.Atom import java.util.stream.Collectors; import com.google.common.base.Objects; -import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; + import com.google.common.collect.Iterables; + import org.junit.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@@ -801,7 -797,11 +803,11 @@@ public abstract class CQLTeste return Schema.instance.getCFMetaData(KEYSPACE, currentTable()); } + protected com.datastax.driver.core.ResultSet executeNet(String query, Object... values) throws Throwable + { + return sessionNet().execute(formatQuery(query), values); + } -protected com.datastax.driver.core.ResultSet executeNet(int protocolVersion, String query, Object... values) throws Throwable +protected com.datastax.driver.core.ResultSet executeNet(ProtocolVersion protocolVersion, String query, Object... values) throws Throwable { return sessionNet(protocolVersion).execute(formatQuery(query), values); } @@@ -952,6 -942,18 +958,13 @@@ rows.length>i ? "less" : "more", rows.length, i, protocolVersion), i == rows.length); } -protected void assertRowsNet(ResultSet result, Object[]... rows) -{ -assertRowsNet(PROTOCOL_VERSIONS.get(PROTOCOL_VERSIONS.size() - 1), result, rows); -} - + protected void assertRowCountNet(ResultSet r1, int expectedCount) + { + Assert.assertFalse("Received a null resultset when expected count was > 0", expectedCount > 0 && r1 == null); + int actualRowCount = Iterables.size(r1); + Assert.assertEquals(String.format("expected %d rows but received %d", expectedCount, actualRowCount), expectedCount, actualRowCount); + } + public static void assertRows(UntypedResultSet result, Object[]... rows) { if (result == null) diff --cc test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterTest.java index dbeefbb7da,f66b66f173..57910fbf6f --- a/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterTest.java @@@ -19,13 -19,17 +19,15 @@@ package org.apache.cassandra.io.sstable import java.io.File; import java.io.FilenameFilter; +import java.io.IOException; import java.nio.ByteBuffer; -import java.util.Arrays; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.Map; -import java.util.UUID; +import java.util.*; import java.util.concurrent.ExecutionException; +import java.util.concurrent.atomic.AtomicInteger; + import java.util.stream.Collectors; + import java.util.stream.StreamSupport; +import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.io.Files; @@@ -35,21 -37,22 +37,23 @@@ import org.junit.Before import org.junit.BeforeClass; import org.junit.Test; + import com.datastax.driver.core.utils.UUIDs; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; -import org.apache.cassandra.config.CFMetaData; -import org.apache.cassandra.config.Config; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.config.Schema; -import org.apache.cassandra.cql3.QueryProcessor; -import org.apache.cassandra.cql3.UntypedResultSet; +import org.apache.cassandra.config.*; +impo
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 01ebd9936f64e0733d587082c5facae1660fb08c Merge: 9810922cf1 a482e37435 Author: Brandon Williams AuthorDate: Wed May 18 10:09:32 2022 -0500 Merge branch 'cassandra-3.0' into cassandra-3.11 .build/dependency-check-suppressions.xml | 1 + CHANGES.txt | 1 + 2 files changed, 2 insertions(+) diff --cc CHANGES.txt index deae7d769e,767741bdd7..689fbfd2ba --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,5 -1,5 +1,6 @@@ -3.0.28 +3.11.14 +Merged from 3.0: + * Suppress CVE-2022-24823 (CASSANDRA-17633) * fsync TOC and digest files (CASSANDRA-10709) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit d043217ff0e16ee3fa14e84def4ba33a458b542e Merge: e5c96230ac 5d427ff6e5 Author: Brandon Williams AuthorDate: Fri May 13 06:48:10 2022 -0500 Merge branch 'cassandra-3.0' into cassandra-3.11 CHANGES.txt | 1 + src/java/org/apache/cassandra/io/sstable/SSTable.java | 5 - src/java/org/apache/cassandra/io/util/ChecksumWriter.java | 11 ++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --cc CHANGES.txt index 0eb2acba28,4462e22067..f409859eea --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,12 -1,5 +1,13 @@@ -3.0.27 +3.11.13 + * Upgrade jackson-databind to 2.13.2.2 (CASSANDRA-17556) + * Upgrade slf4j to 1.7.25 (CASSANDRA-17474) + * Upgrade jackson to 2.13.2 (CASSANDRA-17492) + * emit warning on keyspace creation when replication factor is bigger than the number of nodes (CASSANDRA-16747) + * Fix snapshot true size calculation (CASSANDRA-17267) + * Validate existence of DCs when repairing (CASSANDRA-17407) + * dropping of a materialized view creates a snapshot with dropped- prefix (CASSANDRA-17415) +Merged from 3.0: + * fsync TOC and digest files (CASSANDRA-10709) * Fix URISyntaxException in nodetool with updated Java (CASSANDRA-17581) * Schema mutations may not be completed on drain (CASSANDRA-17524) * Fix data corruption in AbstractCompositeType due to static boolean byte buffers (CASSANDRA-14752) diff --cc src/java/org/apache/cassandra/io/util/ChecksumWriter.java index dc5eaea62d,00..50aaccbc7c mode 100644,00..100644 --- a/src/java/org/apache/cassandra/io/util/ChecksumWriter.java +++ b/src/java/org/apache/cassandra/io/util/ChecksumWriter.java @@@ -1,103 -1,0 +1,104 @@@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.cassandra.io.util; + +import java.io.*; +import java.nio.ByteBuffer; - import java.nio.file.Files; ++import java.nio.charset.StandardCharsets; +import java.util.zip.CRC32; + +import javax.annotation.Nonnull; + - import com.google.common.base.Charsets; - +import org.apache.cassandra.io.FSWriteError; + +public class ChecksumWriter +{ +private final CRC32 incrementalChecksum = new CRC32(); +private final DataOutput incrementalOut; +private final CRC32 fullChecksum = new CRC32(); + +public ChecksumWriter(DataOutput incrementalOut) +{ +this.incrementalOut = incrementalOut; +} + +public void writeChunkSize(int length) +{ +try +{ +incrementalOut.writeInt(length); +} +catch (IOException e) +{ +throw new IOError(e); +} +} + +// checksumIncrementalResult indicates if the checksum we compute for this buffer should itself be +// included in the full checksum, translating to if the partial checksum is serialized along with the +// data it checksums (in which case the file checksum as calculated by external tools would mismatch if +// we did not include it), or independently. + +// CompressedSequentialWriters serialize the partial checksums inline with the compressed data chunks they +// corroborate, whereas ChecksummedSequentialWriters serialize them to a different file. +public void appendDirect(ByteBuffer bb, boolean checksumIncrementalResult) +{ +try +{ +ByteBuffer toAppend = bb.duplicate(); +toAppend.mark(); +incrementalChecksum.update(toAppend); +toAppend.reset(); + +int incrementalChecksumValue = (int) incrementalChecksum.getValue(); +incrementalOut.writeInt(incrementalChecksumValue); + +fullChecksum.update(toAppend); +if (checksumIncrementalResult) +{ +ByteBuffer byteBuffer = ByteBuffer.allocate(4); +byteBuffer.putInt(incrementalChecksumValue); +assert byteBuffer.arrayOffset() == 0; +fullChecksum.update(byteBuf
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit aeced876b51ec9e9479948c39c6708a0d7a1dc07 Merge: 4bb1a07b5b 61d4cccb0b Author: Brandon Williams AuthorDate: Thu May 5 05:55:00 2022 -0500 Merge branch 'cassandra-3.0' into cassandra-3.11 CHANGES.txt| 1 + src/java/org/apache/cassandra/tools/NodeProbe.java | 8 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --cc CHANGES.txt index cb879685a2,df06fa3a95..0eb2acba28 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,12 -1,5 +1,13 @@@ -3.0.27 +3.11.13 + * Upgrade jackson-databind to 2.13.2.2 (CASSANDRA-17556) + * Upgrade slf4j to 1.7.25 (CASSANDRA-17474) + * Upgrade jackson to 2.13.2 (CASSANDRA-17492) + * emit warning on keyspace creation when replication factor is bigger than the number of nodes (CASSANDRA-16747) + * Fix snapshot true size calculation (CASSANDRA-17267) + * Validate existence of DCs when repairing (CASSANDRA-17407) + * dropping of a materialized view creates a snapshot with dropped- prefix (CASSANDRA-17415) +Merged from 3.0: + * Fix URISyntaxException in nodetool with updated Java (CASSANDRA-17581) * Schema mutations may not be completed on drain (CASSANDRA-17524) * Fix data corruption in AbstractCompositeType due to static boolean byte buffers (CASSANDRA-14752) * Add procps dependency to RPM/Debian packages (CASSANDRA-17516) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. jonmeredith pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 804098e68be0f60e495715f745987b364a2e82d9 Merge: eeb89ea53b 2fdbda6ac9 Author: Jon Meredith AuthorDate: Wed Apr 27 11:59:52 2022 -0600 Merge branch 'cassandra-3.0' into cassandra-3.11 CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 6 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --cc CHANGES.txt index 18ff521946,e74b2cba35..66b114a379 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,5 +1,12 @@@ -3.0.27 +3.11.13 + * Upgrade slf4j to 1.7.25 (CASSANDRA-17474) + * Upgrade jackson to 2.13.2 (CASSANDRA-17492) + * emit warning on keyspace creation when replication factor is bigger than the number of nodes (CASSANDRA-16747) + * Fix snapshot true size calculation (CASSANDRA-17267) + * Validate existence of DCs when repairing (CASSANDRA-17407) + * dropping of a materialized view creates a snapshot with dropped- prefix (CASSANDRA-17415) +Merged from 3.0: + * Schema mutations may not be completed on drain (CASSANDRA-17524) * Fix data corruption in AbstractCompositeType due to static boolean byte buffers (CASSANDRA-14752) * Add procps dependency to RPM/Debian packages (CASSANDRA-17516) * Suppress CVE-2021-44521 (CASSANDRA-17492) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. dcapwell pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit d7a9f41cf14e5b8177a08d36cb5477a3436f21b4 Merge: f32d2b06de 850336217b Author: David Capwell AuthorDate: Tue Apr 12 11:45:34 2022 -0700 Merge branch 'cassandra-3.0' into cassandra-3.11 build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --cc build.xml index 5948eca37f,f443e26a8c..be1168ec4d --- a/build.xml +++ b/build.xml @@@ -378,11 -352,14 +378,11 @@@ - + - - - - + - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. jonmeredith pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 311e26bf0589b5035e0ea2a75dd543a1da0f15bb Merge: f7009cf 647ec92 Author: Jon Meredith AuthorDate: Sat Mar 19 08:01:04 2022 -0600 Merge branch 'cassandra-3.0' into cassandra-3.11 CHANGES.txt| 1 + .../transport/ConnectionLimitHandler.java | 44 -- 2 files changed, 41 insertions(+), 4 deletions(-) diff --cc CHANGES.txt index 292d5dd,28fe6ec..8e60deb --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,9 -1,5 +1,10 @@@ -3.0.27 +3.11.13 + * emit warning on keyspace creation when replication factor is bigger than the number of nodes (CASSANDRA-16747) + * Fix snapshot true size calculation (CASSANDRA-17267) + * Validate existence of DCs when repairing (CASSANDRA-17407) + * dropping of a materialized view creates a snapshot with dropped- prefix (CASSANDRA-17415) +Merged from 3.0: + * ConnectionLimitHandler may leaks connection count if remote connection drops (CASSANDRA-17252) * Require ant >= 1.10 (CASSANDRA-17428) * Disallow CONTAINS for UPDATE and DELETE (CASSANDRA-15266) * filter out NULL_VERSION entries from peers table in ConfiguredLimit (CASSANDRA-16518) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 541d769042c8677a17611b43a2cea88e1a64144b Merge: fcdb3d1 34f5990 Author: Brandon Williams AuthorDate: Mon Mar 14 14:04:26 2022 -0500 Merge branch 'cassandra-3.0' into cassandra-3.11 CHANGES.txt | 1 + build.xml | 9 + 2 files changed, 10 insertions(+) diff --cc CHANGES.txt index 3f17d5c,36d6064..a8954b7 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,7 -1,5 +1,8 @@@ -3.0.27 +3.11.13 + * Validate existence of DCs when repairing (CASSANDRA-17407) + * dropping of a materialized view creates a snapshot with dropped- prefix (CASSANDRA-17415) +Merged from 3.0: + * Require ant >= 1.10 (CASSANDRA-17428) * Disallow CONTAINS for UPDATE and DELETE (CASSANDRA-15266) * filter out NULL_VERSION entries from peers table in ConfiguredLimit (CASSANDRA-16518) * Suppress inapplicable CVEs (CASSANDRA-17368) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit fcdb3d154ed111dbeefe8283bf729d6bd172384a Merge: b18a9f0 c52b5ab Author: Andrés de la Peña AuthorDate: Thu Mar 10 13:08:38 2022 + Merge branch 'cassandra-3.0' into cassandra-3.11 CHANGES.txt| 1 + .../cql3/restrictions/StatementRestrictions.java | 6 .../cql3/validation/operations/DeleteTest.java | 33 ++ .../cql3/validation/operations/UpdateTest.java | 31 4 files changed, 60 insertions(+), 11 deletions(-) diff --cc CHANGES.txt index c6708f5,df0a734..3f17d5c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,7 -1,5 +1,8 @@@ -3.0.27 +3.11.13 + * Validate existence of DCs when repairing (CASSANDRA-17407) + * dropping of a materialized view creates a snapshot with dropped- prefix (CASSANDRA-17415) +Merged from 3.0: + * Disallow CONTAINS for UPDATE and DELETE (CASSANDRA-15266) * filter out NULL_VERSION entries from peers table in ConfiguredLimit (CASSANDRA-16518) * Suppress inapplicable CVEs (CASSANDRA-17368) * Fix flaky test - test_cqlsh_completion.TestCqlshCompletion (CASSANDRA-17338) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit a4c9a408e6cb98549a3ea38ef53e11f614579349 Merge: c3d51a8 f18b432 Author: Brandon Williams AuthorDate: Mon Feb 28 07:45:48 2022 -0600 Merge branch 'cassandra-3.0' into cassandra-3.11 .build/dependency-check-suppressions.xml | 3 +++ CHANGES.txt | 1 + 2 files changed, 4 insertions(+) diff --cc CHANGES.txt index 7dcde0b,d6bbcd7..b055b12 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,25 -1,13 +1,26 @@@ -3.0.27 +3.11.13 +Merged from 3.0: + * Suppress inapplicable CVEs (CASSANDRA-17368) * Fix flaky test - test_cqlsh_completion.TestCqlshCompletion (CASSANDRA-17338) * Fixed TestCqlshOutput failing tests (CASSANDRA-17386) - * LeveledCompactionStrategy disk space check improvements (CASSANDRA-17272) * Lazy transaction log replica creation allows incorrect replica content divergence during anticompaction (CASSANDRA-17273) + * LeveledCompactionStrategy disk space check improvements (CASSANDRA-17272) -3.0.26 +3.11.12 * Extend operator control over the UDF threading model for CVE-2021-44521 (CASSANDRA-17352) + * Upgrade snakeyaml to 1.26 in 3.11 (CASSANDRA=17028) + * Add key validation to ssstablescrub (CASSANDRA-16969) + * Update Jackson from 2.9.10 to 2.12.5 (CASSANDRA-16851) + * Include SASI components to snapshots (CASSANDRA-15134) + * Make assassinate more resilient to missing tokens (CASSANDRA-16847) + * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies (CASSANDRA-16854) + * Validate SASI tokenizer options before adding index to schema (CASSANDRA-15135) + * Fixup scrub output when no data post-scrub and clear up old use of row, which really means partition (CASSANDRA-16835) + * Fix ant-junit dependency issue (CASSANDRA-16827) + * Reduce thread contention in CommitLogSegment and HintsBuffer (CASSANDRA-16072) + * Avoid sending CDC column if not enabled (CASSANDRA-16770) +Merged from 3.0: * Fix conversion from megabits to bytes in streaming rate limiter (CASSANDRA-17243) * Upgrade logback to 1.2.9 (CASSANDRA-17204) * Avoid race in AbstractReplicationStrategy endpoint caching (CASSANDRA-16673) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 593872cb28b97e87ee5e74975c11d602cb5414dd Merge: e77738f 679740f Author: Mick Semb Wever AuthorDate: Fri Feb 18 11:13:35 2022 +0100 Merge branch 'cassandra-3.0' into cassandra-3.11 CHANGES.txt | 1 + NEWS.txt| 18 ++ 2 files changed, 19 insertions(+) diff --cc CHANGES.txt index b707c12,6705934..a7a7eed --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,23 -1,11 +1,24 @@@ -3.0.27 +3.11.13 +Merged from 3.0: * Fixed TestCqlshOutput failing tests (CASSANDRA-17386) - * LeveledCompactionStrategy disk space check improvements (CASSANDRA-17272) * Lazy transaction log replica creation allows incorrect replica content divergence during anticompaction (CASSANDRA-17273) + * LeveledCompactionStrategy disk space check improvements (CASSANDRA-17272) -3.0.26 +3.11.12 + * Extend operator control over the UDF threading model for CVE-2021-44521 (CASSANDRA-17352) + * Upgrade snakeyaml to 1.26 in 3.11 (CASSANDRA=17028) + * Add key validation to ssstablescrub (CASSANDRA-16969) + * Update Jackson from 2.9.10 to 2.12.5 (CASSANDRA-16851) + * Include SASI components to snapshots (CASSANDRA-15134) + * Make assassinate more resilient to missing tokens (CASSANDRA-16847) + * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies (CASSANDRA-16854) + * Validate SASI tokenizer options before adding index to schema (CASSANDRA-15135) + * Fixup scrub output when no data post-scrub and clear up old use of row, which really means partition (CASSANDRA-16835) + * Fix ant-junit dependency issue (CASSANDRA-16827) + * Reduce thread contention in CommitLogSegment and HintsBuffer (CASSANDRA-16072) + * Avoid sending CDC column if not enabled (CASSANDRA-16770) +Merged from 3.0: * Fix conversion from megabits to bytes in streaming rate limiter (CASSANDRA-17243) * Upgrade logback to 1.2.9 (CASSANDRA-17204) * Avoid race in AbstractReplicationStrategy endpoint caching (CASSANDRA-16673) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
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 e53ad6461224b1ab096f56d9e2c744126eb532cd Merge: f0bb299 b58a5c8 Author: Marcus Eriksson AuthorDate: Thu Feb 17 10:30:05 2022 +0100 Merge branch 'cassandra-3.0' into cassandra-3.11 CHANGES.txt| 1 + .../cassandra/db/compaction/CompactionTask.java| 6 +- .../db/compaction/LeveledCompactionTask.java | 45 +- .../compaction/writers/CompactionAwareWriter.java | 7 +- .../writers/MajorLeveledCompactionWriter.java | 6 + .../compaction/writers/MaxSSTableSizeWriter.java | 6 + .../SplittingSizeTieredCompactionWriter.java | 8 +- .../compaction/LeveledCompactionStrategyTest.java | 152 + .../{ => writers}/CompactionAwareWriterTest.java | 48 ++- 9 files changed, 267 insertions(+), 12 deletions(-) diff --cc CHANGES.txt index 402048f,4d07a3d..513a8af --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,21 -1,9 +1,22 @@@ -3.0.27 - * LeveledCompactionStrategy disk space check improvements (CASSANDRA-17272) +3.11.13 +Merged from 3.0: * Lazy transaction log replica creation allows incorrect replica content divergence during anticompaction (CASSANDRA-17273) ++ * LeveledCompactionStrategy disk space check improvements (CASSANDRA-17272) -3.0.26 +3.11.12 + * Upgrade snakeyaml to 1.26 in 3.11 (CASSANDRA=17028) + * Add key validation to ssstablescrub (CASSANDRA-16969) + * Update Jackson from 2.9.10 to 2.12.5 (CASSANDRA-16851) + * Include SASI components to snapshots (CASSANDRA-15134) + * Make assassinate more resilient to missing tokens (CASSANDRA-16847) + * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies (CASSANDRA-16854) + * Validate SASI tokenizer options before adding index to schema (CASSANDRA-15135) + * Fixup scrub output when no data post-scrub and clear up old use of row, which really means partition (CASSANDRA-16835) + * Fix ant-junit dependency issue (CASSANDRA-16827) + * Reduce thread contention in CommitLogSegment and HintsBuffer (CASSANDRA-16072) + * Avoid sending CDC column if not enabled (CASSANDRA-16770) +Merged from 3.0: * Fix conversion from megabits to bytes in streaming rate limiter (CASSANDRA-17243) * Upgrade logback to 1.2.9 (CASSANDRA-17204) * Avoid race in AbstractReplicationStrategy endpoint caching (CASSANDRA-16673) diff --cc src/java/org/apache/cassandra/db/compaction/writers/CompactionAwareWriter.java index bc6115e,1ceed1c..7ffe33a --- a/src/java/org/apache/cassandra/db/compaction/writers/CompactionAwareWriter.java +++ b/src/java/org/apache/cassandra/db/compaction/writers/CompactionAwareWriter.java @@@ -158,26 -124,9 +158,26 @@@ public abstract class CompactionAwareWr */ protected void maybeSwitchWriter(DecoratedKey key) { -if (!isInitialized) - switchCompactionLocation(getDirectories().getWriteableLocation(getExpectedWriteSize())); -isInitialized = true; +if (diskBoundaries == null) +{ +if (locationIndex < 0) +{ - Directories.DataDirectory defaultLocation = getWriteDirectory(nonExpiredSSTables, cfs.getExpectedCompactedFileSize(nonExpiredSSTables, OperationType.UNKNOWN)); ++Directories.DataDirectory defaultLocation = getWriteDirectory(nonExpiredSSTables, getExpectedWriteSize()); +switchCompactionLocation(defaultLocation); +locationIndex = 0; +} +return; +} + +if (locationIndex > -1 && key.compareTo(diskBoundaries.get(locationIndex)) < 0) +return; + +int prevIdx = locationIndex; +while (locationIndex == -1 || key.compareTo(diskBoundaries.get(locationIndex)) > 0) +locationIndex++; +if (prevIdx >= 0) +logger.debug("Switching write location from {} to {}", locations.get(prevIdx), locations.get(locationIndex)); +switchCompactionLocation(locations.get(locationIndex)); } /** @@@ -198,45 -147,18 +198,50 @@@ /** * Return a directory where we can expect expectedWriteSize to fit. + * + * @param sstables the sstables to compact + * @return */ -public Directories.DataDirectory getWriteDirectory(long expectedWriteSize) +public Directories.DataDirectory getWriteDirectory(Iterable sstables, long estimatedWriteSize) { -Directories.DataDirectory directory = getDirectories().getWriteableLocation(expectedWriteSize); -if (directory == null) -throw new RuntimeException("Insufficient disk space to write " + expectedWriteSize + " bytes"); +Descriptor descriptor = null; +for (SSTableReader sstable : sstables) +{ +if (descriptor == null)
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit f0bb2996dd7712c78548475ef01b2e03b59707a3 Merge: eeec360 c586cca Author: Brandon Williams AuthorDate: Wed Feb 16 17:27:45 2022 -0600 Merge branch 'cassandra-3.0' into cassandra-3.11 - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
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 eeec360e757c191c517ddb51154c7c4f8d283d88 Merge: 0218d1f 85c202d Author: Marcus Eriksson AuthorDate: Wed Feb 16 10:14:41 2022 +0100 Merge branch 'cassandra-3.0' into cassandra-3.11 CHANGES.txt| 2 + .../org/apache/cassandra/db/lifecycle/LogFile.java | 24 + .../cassandra/db/lifecycle/LogTransactionTest.java | 60 ++ 3 files changed, 65 insertions(+), 21 deletions(-) diff --cc CHANGES.txt index c166202,527450d..402048f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,19 -1,7 +1,21 @@@ -3.0.27 +3.11.13 ++Merged from 3.0: + * Lazy transaction log replica creation allows incorrect replica content divergence during anticompaction (CASSANDRA-17273) -3.0.26 + +3.11.12 + * Upgrade snakeyaml to 1.26 in 3.11 (CASSANDRA=17028) + * Add key validation to ssstablescrub (CASSANDRA-16969) + * Update Jackson from 2.9.10 to 2.12.5 (CASSANDRA-16851) + * Include SASI components to snapshots (CASSANDRA-15134) + * Make assassinate more resilient to missing tokens (CASSANDRA-16847) + * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies (CASSANDRA-16854) + * Validate SASI tokenizer options before adding index to schema (CASSANDRA-15135) + * Fixup scrub output when no data post-scrub and clear up old use of row, which really means partition (CASSANDRA-16835) + * Fix ant-junit dependency issue (CASSANDRA-16827) + * Reduce thread contention in CommitLogSegment and HintsBuffer (CASSANDRA-16072) + * Avoid sending CDC column if not enabled (CASSANDRA-16770) +Merged from 3.0: * Fix conversion from megabits to bytes in streaming rate limiter (CASSANDRA-17243) * Upgrade logback to 1.2.9 (CASSANDRA-17204) * Avoid race in AbstractReplicationStrategy endpoint caching (CASSANDRA-16673) diff --cc src/java/org/apache/cassandra/db/lifecycle/LogFile.java index 39bfaa9,42d81ca..3550d66 --- a/src/java/org/apache/cassandra/db/lifecycle/LogFile.java +++ b/src/java/org/apache/cassandra/db/lifecycle/LogFile.java @@@ -345,11 -341,15 +342,15 @@@ final class LogFile implements AutoClos private LogRecord makeRecord(Type type, SSTable table, LogRecord record) { assert type == Type.ADD || type == Type.REMOVE; + maybeCreateReplica(table); + return record.asType(type); + } - File directory = table.descriptor.directory; + private void maybeCreateReplica(SSTable sstable) + { -File folder = sstable.descriptor.directory; -String fileName = getFileName(folder); -replicas.maybeCreateReplica(folder, fileName, onDiskRecords); ++File directory = sstable.descriptor.directory; +String fileName = StringUtils.join(directory, File.separator, getFileName()); - replicas.maybeCreateReplica(directory, fileName, records); - return record.asType(type); ++replicas.maybeCreateReplica(directory, fileName, onDiskRecords); } void addRecord(LogRecord record) diff --cc test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java index c727241,6fb2334..09c75e1 --- a/test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java +++ b/test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java @@@ -44,15 -44,18 +44,16 @@@ import org.apache.cassandra.MockSchema import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Directories; import org.apache.cassandra.db.SerializationHeader; - import org.apache.cassandra.db.compaction.*; - import org.apache.cassandra.io.sstable.*; + import org.apache.cassandra.db.compaction.OperationType; + import org.apache.cassandra.io.sstable.Component; + import org.apache.cassandra.io.sstable.Descriptor; +import org.apache.cassandra.io.sstable.format.SSTableFormat; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.sstable.metadata.MetadataCollector; import org.apache.cassandra.io.sstable.metadata.MetadataType; import org.apache.cassandra.io.sstable.metadata.StatsMetadata; - import org.apache.cassandra.io.util.FileUtils; -import org.apache.cassandra.io.util.BufferedSegmentedFile; -import org.apache.cassandra.io.util.ChannelProxy; +import org.apache.cassandra.io.util.FileHandle; + import org.apache.cassandra.io.util.FileUtils; -import org.apache.cassandra.io.util.RandomAccessReader; -import org.apache.cassandra.io.util.SegmentedFile; import org.apache.cassandra.utils.AlwaysPresentFilter; import org.apache.cassandra.utils.concurrent.AbstractTransactionalTest; import org.apache.cassandra.utils.concurrent.Transactional; - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@c
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 317f50706055a99fd8908725694856e9e97a4a39 Merge: b44ff92 b18adcb Author: Mick Semb Wever AuthorDate: Mon Feb 7 15:08:15 2022 +0100 Merge branch 'cassandra-3.0' into cassandra-3.11 - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
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 b022aecfa665c021db4fb39267a7cf83f97ec135 Merge: 5d0aeb1 5c9ba06 Author: Marcus Eriksson AuthorDate: Mon Feb 7 12:59:52 2022 +0100 Merge branch 'cassandra-3.0' into cassandra-3.11 src/java/org/apache/cassandra/config/Config.java | 13 + .../apache/cassandra/config/DatabaseDescriptor.java | 16 .../apache/cassandra/cql3/functions/UDFunction.java | 19 ++- .../security/ThreadAwareSecurityManager.java | 5 + 4 files changed, 52 insertions(+), 1 deletion(-) diff --cc src/java/org/apache/cassandra/config/DatabaseDescriptor.java index a5a02ce,ca946ce..d64d054 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@@ -704,227 -737,6 +704,233 @@@ public class DatabaseDescripto conf.server_encryption_options.validate(); +if (conf.user_defined_function_fail_timeout < 0) +throw new ConfigurationException("user_defined_function_fail_timeout must not be negative", false); +if (conf.user_defined_function_warn_timeout < 0) +throw new ConfigurationException("user_defined_function_warn_timeout must not be negative", false); + +if (conf.user_defined_function_fail_timeout < conf.user_defined_function_warn_timeout) +throw new ConfigurationException("user_defined_function_warn_timeout must less than user_defined_function_fail_timeout", false); + ++if (!conf.allow_insecure_udfs && !conf.enable_user_defined_functions_threads) ++throw new ConfigurationException("To be able to set enable_user_defined_functions_threads: false you need to set allow_insecure_udfs: true - this is an unsafe configuration and is not recommended."); ++ ++if (conf.allow_extra_insecure_udfs) ++logger.warn("Allowing java.lang.System.* access in UDFs is dangerous and not recommended. Set allow_extra_insecure_udfs: false to disable."); ++ +if (conf.commitlog_segment_size_in_mb <= 0) +throw new ConfigurationException("commitlog_segment_size_in_mb must be positive, but was " ++ conf.commitlog_segment_size_in_mb, false); +else if (conf.commitlog_segment_size_in_mb >= 2048) +throw new ConfigurationException("commitlog_segment_size_in_mb must be smaller than 2048, but was " ++ conf.commitlog_segment_size_in_mb, false); + +if (conf.max_mutation_size_in_kb == null) +conf.max_mutation_size_in_kb = conf.commitlog_segment_size_in_mb * 1024 / 2; +else if (conf.commitlog_segment_size_in_mb * 1024 < 2 * conf.max_mutation_size_in_kb) +throw new ConfigurationException("commitlog_segment_size_in_mb must be at least twice the size of max_mutation_size_in_kb / 1024", false); + +// native transport encryption options +if (conf.native_transport_port_ssl != null +&& conf.native_transport_port_ssl != conf.native_transport_port +&& !conf.client_encryption_options.enabled) +{ +throw new ConfigurationException("Encryption must be enabled in client_encryption_options for native_transport_port_ssl", false); +} + +// If max protocol version has been set, just validate it's within an acceptable range +if (conf.native_transport_max_negotiable_protocol_version != Integer.MIN_VALUE) +{ +try +{ + ProtocolVersion.decode(conf.native_transport_max_negotiable_protocol_version, ProtocolVersionLimit.SERVER_DEFAULT); +logger.info("Native transport max negotiable version statically limited to {}", conf.native_transport_max_negotiable_protocol_version); +} +catch (Exception e) +{ +throw new ConfigurationException("Invalid setting for native_transport_max_negotiable_protocol_version; " + + ProtocolVersion.invalidVersionMessage(conf.native_transport_max_negotiable_protocol_version)); +} +} + +if (conf.max_value_size_in_mb <= 0) +throw new ConfigurationException("max_value_size_in_mb must be positive", false); +else if (conf.max_value_size_in_mb >= 2048) +throw new ConfigurationException("max_value_size_in_mb must be smaller than 2048, but was " ++ conf.max_value_size_in_mb, false); + +switch (conf.disk_optimization_strategy) +{ +case ssd: +diskOptimizationStrategy = new SsdDiskOptimizationStrategy(conf.disk_optimization_page_cross_chance); +break; +case spi
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. jonmeredith pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit beb456305af307b20376b0190fea6c33d6b38ac6 Merge: bfab1fd 9ff28fc Author: Jon Meredith AuthorDate: Thu Feb 3 14:22:52 2022 -0700 Merge branch 'cassandra-3.0' into cassandra-3.11 src/java/org/apache/cassandra/service/StorageService.java | 14 ++ .../apache/cassandra/distributed/impl/AbstractCluster.java | 8 +++- .../org/apache/cassandra/distributed/impl/Instance.java| 10 ++ .../org/apache/cassandra/distributed/test/GossipTest.java | 3 --- 4 files changed, 27 insertions(+), 8 deletions(-) diff --cc src/java/org/apache/cassandra/service/StorageService.java index 1a0d5b0,22040c1..49f3835 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@@ -4760,61 -4460,17 +4757,70 @@@ public class StorageService extends Not { logger.error("Caught an exception while draining ", t); } +finally +{ +Throwable postShutdownHookThrowable = Throwables.perform(null, postShutdownHooks.stream().map(h -> h::run)); +if (postShutdownHookThrowable != null) +logger.error("Post-shutdown hooks returned exception", postShutdownHookThrowable); +} +} + +/** + * Add a runnable which will be called before shut down or drain. This is useful for other + * applications running in the same JVM which may want to shut down first rather than time + * out attempting to use Cassandra calls which will no longer work. + * @param hook: the code to run + * @return true on success, false if Cassandra is already shutting down, in which case the runnable + * has NOT been added. + */ +public synchronized boolean addPreShutdownHook(Runnable hook) +{ +if (!isDraining() && !isDrained()) +return preShutdownHooks.add(hook); + +return false; +} + +/** + * Remove a preshutdown hook + */ +public synchronized boolean removePreShutdownHook(Runnable hook) +{ +return preShutdownHooks.remove(hook); +} + +/** + * Add a runnable which will be called after shutdown or drain. This is useful for other applications + * running in the same JVM that Cassandra needs to work and should shut down later. + * @param hook: the code to run + * @return true on success, false if Cassandra is already shutting down, in which case the runnable has NOT been + * added. + */ +public synchronized boolean addPostShutdownHook(Runnable hook) +{ +if (!isDraining() && !isDrained()) +return postShutdownHooks.add(hook); + +return false; +} + +/** + * Remove a postshutdownhook + */ +public synchronized boolean removePostShutdownHook(Runnable hook) +{ +return postShutdownHooks.remove(hook); } + @VisibleForTesting + public void disableAutoCompaction() + { + // disable autocompaction - we don't want to start any new compactions while we are draining + for (Keyspace keyspace : Keyspace.all()) + for (ColumnFamilyStore cfs : keyspace.getColumnFamilyStores()) + cfs.disableAutoCompaction(); + } + /** * Some services are shutdown during draining and we should not attempt to start them again. * diff --cc test/distributed/org/apache/cassandra/distributed/impl/Instance.java index 80728e2,776def3..1859742 --- a/test/distributed/org/apache/cassandra/distributed/impl/Instance.java +++ b/test/distributed/org/apache/cassandra/distributed/impl/Instance.java @@@ -717,8 -770,14 +725,10 @@@ public class Instance extends IsolatedE if (config.has(GOSSIP) || config.has(NETWORK)) { StorageService.instance.shutdownServer(); - -error = parallelRun(error, executor, -() -> NanoTimeToCurrentTimeMillis.shutdown(MINUTES.toMillis(1L)) -); } + error = parallelRun(error, executor, StorageService.instance::disableAutoCompaction); + error = parallelRun(error, executor, () -> Gossiper.instance.stopShutdownAndWait(1L, MINUTES), CompactionManager.instance::forceShutdown, - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit bfab1fda882c368be0d2c9dad38cb5dbee501bfa Merge: 9c6efe1 40bf533 Author: Andrés de la Peña AuthorDate: Wed Jan 26 11:38:48 2022 + Merge branch 'cassandra-3.0' into cassandra-3.11 CHANGES.txt| 1 + NEWS.txt | 6 ++ src/java/org/apache/cassandra/streaming/StreamManager.java | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --cc CHANGES.txt index c810378,2b9cf2a..579cea2 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,16 -1,5 +1,17 @@@ -3.0.26: +3.11.12 + * Upgrade snakeyaml to 1.26 in 3.11 (CASSANDRA=17028) + * Add key validation to ssstablescrub (CASSANDRA-16969) + * Update Jackson from 2.9.10 to 2.12.5 (CASSANDRA-16851) + * Include SASI components to snapshots (CASSANDRA-15134) + * Make assassinate more resilient to missing tokens (CASSANDRA-16847) + * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies (CASSANDRA-16854) + * Validate SASI tokenizer options before adding index to schema (CASSANDRA-15135) + * Fixup scrub output when no data post-scrub and clear up old use of row, which really means partition (CASSANDRA-16835) + * Fix ant-junit dependency issue (CASSANDRA-16827) + * Reduce thread contention in CommitLogSegment and HintsBuffer (CASSANDRA-16072) + * Avoid sending CDC column if not enabled (CASSANDRA-16770) +Merged from 3.0: + * Fix conversion from megabits to bytes in streaming rate limiter (CASSANDRA-17243) * Upgrade logback to 1.2.9 (CASSANDRA-17204) * Avoid race in AbstractReplicationStrategy endpoint caching (CASSANDRA-16673) * Fix abort when window resizing during cqlsh COPY (CASSANDRA-15230) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 7e684482353b763d7f41b9cb15d311bf150174f8 Merge: b5d0626 28004d9 Author: Brandon Williams AuthorDate: Thu Jan 20 09:47:23 2022 -0600 Merge branch 'cassandra-3.0' into cassandra-3.11 CHANGES.txt | 1 + build.xml| 4 ++-- .../apache/cassandra/config/DatabaseDescriptorRefTest.java | 2 +- .../cql3/validation/operations/AggregationTest.java | 12 4 files changed, 16 insertions(+), 3 deletions(-) diff --cc CHANGES.txt index 5e8213f,65fe841..c810378 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,16 -1,5 +1,17 @@@ -3.0.26: +3.11.12 + * Upgrade snakeyaml to 1.26 in 3.11 (CASSANDRA=17028) + * Add key validation to ssstablescrub (CASSANDRA-16969) + * Update Jackson from 2.9.10 to 2.12.5 (CASSANDRA-16851) + * Include SASI components to snapshots (CASSANDRA-15134) + * Make assassinate more resilient to missing tokens (CASSANDRA-16847) + * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies (CASSANDRA-16854) + * Validate SASI tokenizer options before adding index to schema (CASSANDRA-15135) + * Fixup scrub output when no data post-scrub and clear up old use of row, which really means partition (CASSANDRA-16835) + * Fix ant-junit dependency issue (CASSANDRA-16827) + * Reduce thread contention in CommitLogSegment and HintsBuffer (CASSANDRA-16072) + * Avoid sending CDC column if not enabled (CASSANDRA-16770) +Merged from 3.0: + * Upgrade logback to 1.2.9 (CASSANDRA-17204) * Avoid race in AbstractReplicationStrategy endpoint caching (CASSANDRA-16673) * Fix abort when window resizing during cqlsh COPY (CASSANDRA-15230) * Fix slow keycache load which blocks startup for tables with many sstables (CASSANDRA-14898) diff --cc build.xml index 9b4b086,6dd09fe..a094e8b --- a/build.xml +++ b/build.xml @@@ -351,11 -326,10 +351,11 @@@ - - + + - - + + + diff --cc test/unit/org/apache/cassandra/config/DatabaseDescriptorRefTest.java index 791212d,000..83c6bea mode 100644,00..100644 --- a/test/unit/org/apache/cassandra/config/DatabaseDescriptorRefTest.java +++ b/test/unit/org/apache/cassandra/config/DatabaseDescriptorRefTest.java @@@ -1,285 -1,0 +1,285 @@@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.cassandra.config; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.PrintStream; +import java.lang.management.ManagementFactory; +import java.lang.management.ThreadInfo; +import java.lang.management.ThreadMXBean; +import java.lang.reflect.Method; +import java.net.URL; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + +import org.junit.Test; + +import org.apache.cassandra.utils.Pair; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + +/** + * Verifies that {@link DatabaseDescriptor#clientInitialization()} } and a couple of apply methods + * do not somehow lazily initialize any unwanted part of Cassandra like schema, commit log or start + * unexpected threads. + * + * {@link DatabaseDescriptor#toolInitialization()} is tested via unit tests extending + * {@link org.apache.cassandra.tools.ToolsTester}. + */ +public class DatabaseDescriptorRefTest +{ +static final String[] validClasses = { +"org.apache.cassandra.auth.IInternodeAuthenticator", +"org.apache.cassandra.auth.IAuthenticator", +"org.apache.cassandra.auth.IAuthorizer", +"org.apache.cassandra.auth.IRoleManager", +"org.apache.cassandra.config.DatabaseDescriptor", +
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
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 b5d062682428aa1118a086777c309bfecb96c138 Merge: 1d52275 b1a8a56 Author: Marcus Eriksson AuthorDate: Mon Jan 17 14:07:38 2022 +0100 Merge branch 'cassandra-3.0' into cassandra-3.11 CHANGES.txt| 1 + .../locator/AbstractReplicationStrategy.java | 98 - .../apache/cassandra/locator/TokenMetadata.java| 9 +- .../distributed/test/ReadsDuringBootstrapTest.java | 120 + .../locator/AbstractReplicationStrategyTest.java | 45 5 files changed, 246 insertions(+), 27 deletions(-) diff --cc CHANGES.txt index 382f786,e23f5e7..5e8213f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,16 -1,5 +1,17 @@@ -3.0.26: +3.11.12 + * Upgrade snakeyaml to 1.26 in 3.11 (CASSANDRA=17028) + * Add key validation to ssstablescrub (CASSANDRA-16969) + * Update Jackson from 2.9.10 to 2.12.5 (CASSANDRA-16851) + * Include SASI components to snapshots (CASSANDRA-15134) + * Make assassinate more resilient to missing tokens (CASSANDRA-16847) + * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies (CASSANDRA-16854) + * Validate SASI tokenizer options before adding index to schema (CASSANDRA-15135) + * Fixup scrub output when no data post-scrub and clear up old use of row, which really means partition (CASSANDRA-16835) + * Fix ant-junit dependency issue (CASSANDRA-16827) + * Reduce thread contention in CommitLogSegment and HintsBuffer (CASSANDRA-16072) + * Avoid sending CDC column if not enabled (CASSANDRA-16770) +Merged from 3.0: + * Avoid race in AbstractReplicationStrategy endpoint caching (CASSANDRA-16673) * Fix abort when window resizing during cqlsh COPY (CASSANDRA-15230) * Fix slow keycache load which blocks startup for tables with many sstables (CASSANDRA-14898) * Fix rare NPE caused by batchlog replay / node decomission races (CASSANDRA-17049) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit b17d701c5843ed88b5503b22ba07ff170a2e30ca Merge: 78f5057 75e0e8c Author: Brandon Williams AuthorDate: Tue Jan 11 08:23:01 2022 -0600 Merge branch 'cassandra-3.0' into cassandra-3.11 CHANGES.txt| 1 + pylib/cqlshlib/copyutil.py | 13 +++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --cc CHANGES.txt index 3e5dc2b,20fbb32..382f786 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,16 -1,5 +1,17 @@@ -3.0.26: +3.11.12 + * Upgrade snakeyaml to 1.26 in 3.11 (CASSANDRA=17028) + * Add key validation to ssstablescrub (CASSANDRA-16969) + * Update Jackson from 2.9.10 to 2.12.5 (CASSANDRA-16851) + * Include SASI components to snapshots (CASSANDRA-15134) + * Make assassinate more resilient to missing tokens (CASSANDRA-16847) + * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies (CASSANDRA-16854) + * Validate SASI tokenizer options before adding index to schema (CASSANDRA-15135) + * Fixup scrub output when no data post-scrub and clear up old use of row, which really means partition (CASSANDRA-16835) + * Fix ant-junit dependency issue (CASSANDRA-16827) + * Reduce thread contention in CommitLogSegment and HintsBuffer (CASSANDRA-16072) + * Avoid sending CDC column if not enabled (CASSANDRA-16770) +Merged from 3.0: + * Fix abort when window resizing during cqlsh COPY (CASSANDRA-15230) * Fix slow keycache load which blocks startup for tables with many sstables (CASSANDRA-14898) * Fix rare NPE caused by batchlog replay / node decomission races (CASSANDRA-17049) * Allow users to view permissions of the roles they created (CASSANDRA-16902) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. jonmeredith pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 78f50573ad9238c34c7779a8dc33967d65944964 Merge: 05b0eae 071ecb5 Author: Jon Meredith AuthorDate: Thu Jan 6 14:30:31 2022 -0700 Merge branch 'cassandra-3.0' into cassandra-3.11 CHANGES.txt| 1 + .../db/compaction/CompactionExecutorTest.java | 32 +- 2 files changed, 20 insertions(+), 13 deletions(-) diff --cc test/unit/org/apache/cassandra/db/compaction/CompactionExecutorTest.java index 2f8b5b2,b1f29b3..918d58c --- a/test/unit/org/apache/cassandra/db/compaction/CompactionExecutorTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/CompactionExecutorTest.java @@@ -25,7 -24,7 +24,8 @@@ import org.junit.After import org.junit.Before; import org.junit.Test; import org.apache.cassandra.concurrent.DebuggableThreadPoolExecutor; +import org.apache.cassandra.config.DatabaseDescriptor; + import org.apache.cassandra.utils.concurrent.SimpleCondition; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@@ -54,8 -58,9 +59,10 @@@ public class CompactionExecutorTes @Before public void setup() { +DatabaseDescriptor.daemonInitialization(); executor = new TestTaskExecutor(); + testTaskThrowable = null; + afterExecuteCompleted = new SimpleCondition(); } @After - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. jolynch pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 1fce84f9833bd62227dbf8f5d063935457dbc18e Merge: cd73c14 1911a88 Author: Joseph Lynch AuthorDate: Thu Dec 9 10:24:19 2021 -0500 Merge branch 'cassandra-3.0' into cassandra-3.11 CHANGES.txt| 1 + conf/cassandra.yaml| 7 +- .../apache/cassandra/cache/AutoSavingCache.java| 8 +- src/java/org/apache/cassandra/config/Config.java | 2 + .../cassandra/config/DatabaseDescriptor.java | 11 ++ .../org/apache/cassandra/db/lifecycle/View.java| 2 +- .../org/apache/cassandra/service/CacheService.java | 40 -- .../test/microbench/CacheLoaderBench.java | 137 .../unit/org/apache/cassandra/db/KeyCacheTest.java | 138 - 9 files changed, 332 insertions(+), 14 deletions(-) diff --cc CHANGES.txt index 6bda91e,085e1ff..6c70235 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,16 -1,5 +1,17 @@@ -3.0.26: +3.11.12 + * Upgrade snakeyaml to 1.26 in 3.11 (CASSANDRA=17028) + * Add key validation to ssstablescrub (CASSANDRA-16969) + * Update Jackson from 2.9.10 to 2.12.5 (CASSANDRA-16851) + * Include SASI components to snapshots (CASSANDRA-15134) + * Make assassinate more resilient to missing tokens (CASSANDRA-16847) + * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies (CASSANDRA-16854) + * Validate SASI tokenizer options before adding index to schema (CASSANDRA-15135) + * Fixup scrub output when no data post-scrub and clear up old use of row, which really means partition (CASSANDRA-16835) + * Fix ant-junit dependency issue (CASSANDRA-16827) + * Reduce thread contention in CommitLogSegment and HintsBuffer (CASSANDRA-16072) + * Avoid sending CDC column if not enabled (CASSANDRA-16770) +Merged from 3.0: + * Fix slow keycache load which blocks startup for tables with many sstables (CASSANDRA-14898) * Fix rare NPE caused by batchlog replay / node decomission races (CASSANDRA-17049) * Allow users to view permissions of the roles they created (CASSANDRA-16902) * Fix failure handling in inter-node communication (CASSANDRA-16334) diff --cc test/unit/org/apache/cassandra/db/KeyCacheTest.java index ada6b5b,9cb06b9..f31df18 --- a/test/unit/org/apache/cassandra/db/KeyCacheTest.java +++ b/test/unit/org/apache/cassandra/db/KeyCacheTest.java @@@ -17,33 -17,49 +17,49 @@@ */ package org.apache.cassandra.db; +import java.io.IOException; + import java.util.ArrayList; import java.util.Collection; + import java.util.Collections; import java.util.HashMap; import java.util.Iterator; + import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.ExecutionException; + import java.util.concurrent.TimeUnit; import com.google.common.collect.ImmutableList; -import com.google.common.util.concurrent.Uninterruptibles; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; + import org.apache.cassandra.cache.AutoSavingCache; + import org.apache.cassandra.cache.ICache; import org.apache.cassandra.cache.KeyCacheKey; -import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.config.Schema; import org.apache.cassandra.db.compaction.OperationType; import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.db.lifecycle.LifecycleTransaction; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.sstable.format.SSTableReader; + import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.service.CacheService; + import org.apache.cassandra.utils.Pair; import org.apache.cassandra.utils.concurrent.Refs; ++import org.hamcrest.Matchers; + import org.mockito.Mockito; + import org.mockito.internal.stubbing.answers.AnswersWithDelay; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; ++import static org.junit.Assert.assertNotEquals; ++import static org.junit.Assert.assertThat; + import static org.mockito.ArgumentMatchers.any; + import static org.mockito.Mockito.doAnswer; + import static org.mockito.Mockito.mock; public class KeyCacheTest { @@@ -51,9 -68,11 +68,14 @@@ private static final String COLUMN_FAMILY1 = "Standard1"; private static final String COLUMN_FAMILY2 = "Standard2"; private static final String COLUMN_FAMILY3 = "Standard3"; +private static final String COLUMN_FAMILY4 = "Standard4"; +private static final String COLUMN_FAMILY5 = "Standard5"; +private static final String COLUMN_FAMILY6 = "Standa
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit cd73c14cec6417a100e2f667671eef2f485a34ea Merge: 40f4fe7 44d81b5 Author: Mick Semb Wever AuthorDate: Wed Nov 17 10:27:31 2021 +0100 Merge branch 'cassandra-3.0' into cassandra-3.11 .build/build-resolver.xml | 66 +++ build.xml | 4 ++- 2 files changed, 36 insertions(+), 34 deletions(-) diff --cc .build/build-resolver.xml index 02722f8,de98eed..698fb57 --- a/.build/build-resolver.xml +++ b/.build/build-resolver.xml @@@ -21,12 -21,8 +21,12 @@@ - + https://repo1.maven.org/maven2/org/apache/maven/resolver/maven-resolver-ant-tasks"; /> + + + + @@@ -151,9 -143,8 +151,9 @@@ + - + - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 3d74cad35f94eaa2003c51e9755d5c71adb093f6 Merge: c76a939 969531a Author: Andrés de la Peña AuthorDate: Wed Oct 27 18:08:41 2021 +0100 Merge branch 'cassandra-3.0' into cassandra-3.11 CHANGES.txt | 1 + .../org/apache/cassandra/auth/CassandraAuthorizer.java | 16 ++-- src/java/org/apache/cassandra/auth/RoleResource.java | 3 ++- .../cassandra/cql3/statements/CreateRoleStatement.java | 2 +- 4 files changed, 14 insertions(+), 8 deletions(-) diff --cc CHANGES.txt index 0f8b5de,768c45e..ae98091 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,16 -1,5 +1,17 @@@ -3.0.26: +3.11.12 + * Upgrade snakeyaml to 1.26 in 3.11 (CASSANDRA=17028) + * Add key validation to ssstablescrub (CASSANDRA-16969) + * Update Jackson from 2.9.10 to 2.12.5 (CASSANDRA-16851) + * Include SASI components to snapshots (CASSANDRA-15134) + * Make assassinate more resilient to missing tokens (CASSANDRA-16847) + * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies (CASSANDRA-16854) + * Validate SASI tokenizer options before adding index to schema (CASSANDRA-15135) + * Fixup scrub output when no data post-scrub and clear up old use of row, which really means partition (CASSANDRA-16835) + * Fix ant-junit dependency issue (CASSANDRA-16827) + * Reduce thread contention in CommitLogSegment and HintsBuffer (CASSANDRA-16072) + * Avoid sending CDC column if not enabled (CASSANDRA-16770) +Merged from 3.0: + * Allow users to view permissions of the roles they created (CASSANDRA-16902) * Fix failure handling in inter-node communication (CASSANDRA-16334) * Log more information when a node runs out of commitlog space (CASSANDRA-11323) * Don't take snapshots when truncating system tables (CASSANDRA-16839) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit c76a939c3eb9aa68abd0b892ab09bcbf09157e10 Merge: fa532a6 7f54fe0 Author: Andrés de la Peña AuthorDate: Tue Oct 26 18:18:01 2021 +0100 Merge branch 'cassandra-3.0' into cassandra-3.11 CHANGES.txt | 1 + .../org/apache/cassandra/db/MutationVerbHandler.java | 3 ++- .../org/apache/cassandra/net/MessageDeliveryTask.java | 19 --- .../service/AbstractWriteResponseHandler.java | 3 +++ .../org/apache/cassandra/service/StorageProxy.java| 2 +- 5 files changed, 23 insertions(+), 5 deletions(-) diff --cc CHANGES.txt index 8460705,7dd58ff..0f8b5de --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,16 -1,5 +1,17 @@@ -3.0.26: +3.11.12 + * Upgrade snakeyaml to 1.26 in 3.11 (CASSANDRA=17028) + * Add key validation to ssstablescrub (CASSANDRA-16969) + * Update Jackson from 2.9.10 to 2.12.5 (CASSANDRA-16851) + * Include SASI components to snapshots (CASSANDRA-15134) + * Make assassinate more resilient to missing tokens (CASSANDRA-16847) + * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies (CASSANDRA-16854) + * Validate SASI tokenizer options before adding index to schema (CASSANDRA-15135) + * Fixup scrub output when no data post-scrub and clear up old use of row, which really means partition (CASSANDRA-16835) + * Fix ant-junit dependency issue (CASSANDRA-16827) + * Reduce thread contention in CommitLogSegment and HintsBuffer (CASSANDRA-16072) + * Avoid sending CDC column if not enabled (CASSANDRA-16770) +Merged from 3.0: + * Fix failure handling in inter-node communication (CASSANDRA-16334) * Log more information when a node runs out of commitlog space (CASSANDRA-11323) * Don't take snapshots when truncating system tables (CASSANDRA-16839) * Make -Dtest.methods consistently optional in all Ant test targets (CASSANDRA-17014) diff --cc src/java/org/apache/cassandra/net/MessageDeliveryTask.java index c91e9da,26e780f..3de84d8 --- a/src/java/org/apache/cassandra/net/MessageDeliveryTask.java +++ b/src/java/org/apache/cassandra/net/MessageDeliveryTask.java @@@ -23,20 -25,21 +25,21 @@@ import java.util.EnumSet import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.apache.cassandra.db.Mutation; import org.apache.cassandra.db.filter.TombstoneOverwhelmingException; +import org.apache.cassandra.exceptions.RequestFailureReason; import org.apache.cassandra.gms.Gossiper; import org.apache.cassandra.index.IndexNotAvailableException; +import org.apache.cassandra.io.util.DataOutputBuffer; public class MessageDeliveryTask implements Runnable { private static final Logger logger = LoggerFactory.getLogger(MessageDeliveryTask.class); - private final MessageIn message; + private final MessageIn message; private final int id; -private final long constructionTime; -private final boolean isCrossNodeTimestamp; - public MessageDeliveryTask(MessageIn message, int id) -public MessageDeliveryTask(MessageIn message, int id, long timestamp, boolean isCrossNodeTimestamp) ++public MessageDeliveryTask(MessageIn message, int id) { assert message != null; this.message = message; @@@ -89,23 -93,20 +92,33 @@@ { if (message.doCallbackOnFailure()) { -MessageOut response = new MessageOut<>(MessagingService.Verb.INTERNAL_RESPONSE) +MessageOut response = new MessageOut(MessagingService.Verb.INTERNAL_RESPONSE) .withParameter(MessagingService.FAILURE_RESPONSE_PARAM, MessagingService.ONE_BYTE); +if (t instanceof TombstoneOverwhelmingException) +{ +try (DataOutputBuffer out = new DataOutputBuffer()) +{ + out.writeShort(RequestFailureReason.READ_TOO_MANY_TOMBSTONES.code); +response = response.withParameter(MessagingService.FAILURE_REASON_PARAM, out.getData()); +} +catch (IOException ex) +{ +throw new RuntimeException(ex); +} +} + - MessagingService.instance().sendReply(response, id, message.from); + InetAddress from; + byte[] fromBytes = message.parameters.get(Mutation.FORWARD_FROM); + try + { + from = fromBytes != null ? InetAddress.getByAddress(fromBytes) : message.from; + } + catch (UnknownHostException e) + { + throw new RuntimeException(e); + } + MessagingService.instance().sendReply(response, id, from); } } diff --cc src/java/org/apache/cassandra/service/Stor
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 386fe19d7d955ba3a22261d577ea2ac0ca56ecd1 Merge: 20abdfc 94611e9 Author: Brandon Williams AuthorDate: Thu Oct 21 07:38:48 2021 -0500 Merge branch 'cassandra-3.0' into cassandra-3.11 ide/idea/workspace.xml | 1 + 1 file changed, 1 insertion(+) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 20abdfcdd32df14998f459311ea83ec20029d5aa Merge: 7e95c92 f71dfdc Author: Brandon Williams AuthorDate: Wed Oct 20 10:59:44 2021 -0500 Merge branch 'cassandra-3.0' into cassandra-3.11 src/java/org/apache/cassandra/transport/Message.java | 6 ++ 1 file changed, 6 insertions(+) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 7e95c92d00df83d8333852e37813a871a1aada93 Merge: 5c7603c ee6cd06 Author: Andrés de la Peña AuthorDate: Tue Oct 19 11:41:12 2021 +0100 Merge branch 'cassandra-3.0' into cassandra-3.11 .circleci/config-2_1.yml| 28 +++-- .circleci/config-2_1.yml.high_res.patch | 103 +++- .circleci/config-2_1.yml.mid_res.patch | 45 +++--- .circleci/config.yml.MIDRES | 6 +- 4 files changed, 138 insertions(+), 44 deletions(-) diff --cc .circleci/config-2_1.yml.high_res.patch index 3c85668,09df2e1..ffe37e2 --- a/.circleci/config-2_1.yml.high_res.patch +++ b/.circleci/config-2_1.yml.high_res.patch @@@ -1,28 -1,75 +1,75 @@@ - 17,18c17,18 - < CCM_MAX_HEAP_SIZE: 1024M - < CCM_HEAP_NEWSIZE: 256M - --- - > CCM_MAX_HEAP_SIZE: 2048M - > CCM_HEAP_NEWSIZE: 512M - 23,24c23,24 - < #exec_resource_class: xlarge - < parallelism: 4 - --- - > exec_resource_class: xlarge - > parallelism: 100 - 29,30c29,30 - < #exec_resource_class: xlarge - < parallelism: 1 - --- - > exec_resource_class: xlarge - > parallelism: 2 - 35,36c35,36 - < #exec_resource_class: xlarge - < parallelism: 1 - --- - > exec_resource_class: xlarge - > parallelism: 2 - 41c41 - < #exec_resource_class: xlarge - --- - > exec_resource_class: xlarge .circleci/config-2_1.yml 2021-10-19 11:08:44.0 +0100 -+++ .circleci/config-2_1.yml.HIGHRES 2021-10-19 11:26:16.0 +0100 ++--- .circleci/config-2_1.yml 2021-10-18 11:17:08.0 +0100 + .circleci/config-2_1.yml.HIGHRES 2021-10-18 11:22:50.0 +0100 + @@ -40,8 +40,8 @@ + CASSANDRA_SKIP_SYNC: true + DTEST_REPO: git://github.com/apache/cassandra-dtest.git + DTEST_BRANCH: trunk + -CCM_MAX_HEAP_SIZE: 1024M + -CCM_HEAP_NEWSIZE: 256M + +CCM_MAX_HEAP_SIZE: 2048M + +CCM_HEAP_NEWSIZE: 512M + + # The Ant test target to run, for example: + # REPEATED_UTEST_TARGET: testsome + @@ -100,46 +100,50 @@ + j8_par_executor: &j8_par_executor +executor: + name: java8-executor + -#exec_resource_class: xlarge + - parallelism: 4 + +exec_resource_class: xlarge + + parallelism: 100 + + j8_small_par_executor: &j8_small_par_executor +executor: + name: java8-executor + -#exec_resource_class: xlarge + - parallelism: 1 + +exec_resource_class: xlarge + + parallelism: 2 + + j8_medium_par_executor: &j8_medium_par_executor +executor: + name: java8-executor + -#exec_resource_class: xlarge + - parallelism: 1 + +exec_resource_class: xlarge + + parallelism: 2 + + j8_seq_executor: &j8_seq_executor +executor: + name: java8-executor + -#exec_resource_class: xlarge + +exec_resource_class: xlarge +parallelism: 1 # sequential, single container tests: no parallelism benefits + + j8_repeated_utest_executor: &j8_repeated_utest_executor +executor: + name: java8-executor + - parallelism: 4 + +exec_resource_class: xlarge + + parallelism: 100 + + j8_repeated_dtest_executor: &j8_repeated_dtest_executor +executor: + name: java8-executor + - parallelism: 4 + +exec_resource_class: xlarge + + parallelism: 100 + + j8_repeated_upgrade_dtest_executor: &j8_repeated_upgrade_dtest_executor +executor: + name: java8-executor + - parallelism: 4 + +exec_resource_class: xlarge + + parallelism: 100 + + j8_repeated_jvm_upgrade_dtest_executor: &j8_repeated_jvm_upgrade_dtest_executor +executor: + name: java8-executor + - parallelism: 4 + +exec_resource_class: xlarge + + parallelism: 100 + + with_dtests_jobs: &with_dtest_jobs +jobs: diff --cc .circleci/config-2_1.yml.mid_res.patch index c24cebf,bcb47fc..bf1f3f7 --- a/.circleci/config-2_1.yml.mid_res.patch +++ b/.circleci/config-2_1.yml.mid_res.patch @@@ -1,8 -1,6 +1,6 @@@ - diff --git a/.circleci/config-2_1.yml b/.circleci/config-2_1.yml - index 03e4ae9e8f..cf2b758187 100644 - --- a/.circleci/config-2_1.yml - +++ b/.circleci/config-2_1.yml - @@ -93,24 +93,40 @@ j8_par_executor: &j8_par_executor .circleci/config-2_1.yml 2021-10-19 11:08:44.0 +0100 -+++ .circleci/config-2_1.yml.MIDRES 2021-10-19 11:26:16.0 +0100 ++--- .circleci/config-2_1.yml 2021-10-18 11:17:08.0 +0100 + .circleci/config-2_1.yml.MIDRES 2021-10-18 11:20:45.0 +0100 + @@ -101,45 +101,65 @@ executor: name: java8-executor #exec_resource_class: xlarge @@@ -45,9 -43,38 +43,38 @@@ +exec_resource_class: medium parallelism: 1 # sequential, single container tests: no parallelism benefits + j8_repeated_utest_executor: &j8_repeated_utest_executor +executor: + name: java8-executor + - parallelism: 4 + +exec_resource_class: medium + + para
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 733c72b98ffb8808f9e7b61c0722d6a1d03cc951 Merge: d2d5ce8 efc27d6 Author: Andrés de la Peña AuthorDate: Thu Oct 14 12:31:30 2021 +0100 Merge branch 'cassandra-3.0' into cassandra-3.11 .circleci/config-2_1.yml | 288 --- .circleci/config.yml | 105 ++-- .circleci/config.yml.HIGHRES | 105 ++-- .circleci/config.yml.LOWRES | 105 ++-- .circleci/config.yml.MIDRES | 105 ++-- 5 files changed, 566 insertions(+), 142 deletions(-) diff --cc .circleci/config-2_1.yml index 2fcfc09,70348fb..42b519a --- a/.circleci/config-2_1.yml +++ b/.circleci/config-2_1.yml @@@ -122,106 -122,178 +122,190 @@@ j8_seq_executor: &j8_seq_executo parallelism: 1 # sequential, single container tests: no parallelism benefits with_dtests_jobs: &with_dtest_jobs - jobs: - - build - # Java 8 unit tests will be run automatically - - j8_unit_tests: - requires: - - build - - j8_jvm_dtests: - requires: - - build - # specialized unit tests (all run on request using Java 8) - - start_utests_long: - type: approval - requires: - - build - - utests_long: - requires: - - start_utests_long - - start_utests_compression: - type: approval - requires: - - build - - utests_compression: - requires: - - start_utests_compression - - start_utests_stress: - type: approval - requires: - - build - - utests_stress: - requires: - - start_utests_stress - - start_j8_dtest_jars_build: - type: approval - - j8_dtest_jars_build: - requires: - - build - - start_j8_dtest_jars_build - - start_jvm_upgrade_dtest: - type: approval - - j8_jvm_upgrade_dtests: - requires: - - start_jvm_upgrade_dtest - - j8_dtest_jars_build - # Java 8 dtests (on request) - - start_j8_dtests: - type: approval - requires: - - build - - j8_dtests-with-vnodes: - requires: - - start_j8_dtests - - j8_dtests-no-vnodes: - requires: - - start_j8_dtests - # Java 8 upgrade tests - - start_upgrade_tests: - type: approval - requires: - - build - - j8_upgradetests-no-vnodes: - requires: - - start_upgrade_tests - # Java 8 repeated utest (on request) - - start_j8_repeated_utest: - type: approval - - j8_repeated_utest: - requires: - - start_j8_repeated_utest - - build - # Java 8 repeated dtest (on request) - - start_j8_repeated_dtest: - type: approval - - j8_repeated_dtest: - requires: - - start_j8_repeated_dtest - - build - # Repeated Python upgrade dtest (on request) - - start_repeated_upgrade_dtest: - type: approval - - repeated_upgrade_dtest: - requires: - - start_repeated_upgrade_dtest - - build - # Repeated JVM upgrade dtest (on request) - - start_repeated_jvm_upgrade_dtest: - type: approval - - repeated_jvm_upgrade_dtest: - requires: - - start_repeated_jvm_upgrade_dtest - - j8_dtest_jars_build - - with_dtest_jobs_only: &with_dtest_jobs_only - jobs: - - build - - j8_dtests-with-vnodes: - requires: - - build - - j8_dtests-no-vnodes: - requires: - - build + jobs: + - start_build: + type: approval + - build: + requires: + - start_build + # Java 8 unit tests + - start_j8_unit_tests: + type: approval + - j8_unit_tests: + requires: + - start_j8_unit_tests + - build + - start_j8_jvm_dtests: + type: approval + - j8_jvm_dtests: + requires: + - start_j8_jvm_dt
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. maedhroz pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit d2d5ce855a71291387f16ad1b0283677054948f6 Merge: 9d28beb 4cc6375 Author: Caleb Rackliffe AuthorDate: Tue Oct 12 16:38:16 2021 -0500 Merge branch 'cassandra-3.0' into cassandra-3.11 src/java/org/apache/cassandra/service/ReadCallback.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 9d28bebde8028c506bb521a7beec7db60f0b9918 Merge: 939ab71 0e12b8d Author: Brandon Williams AuthorDate: Mon Oct 11 12:00:46 2021 -0500 Merge branch 'cassandra-3.0' into cassandra-3.11 CHANGES.txt | 1 + src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 17 ++--- src/java/org/apache/cassandra/db/SystemKeyspace.java| 6 +++--- 3 files changed, 18 insertions(+), 6 deletions(-) diff --cc CHANGES.txt index a40b226,ae88aaa..d43066e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,15 -1,5 +1,16 @@@ -3.0.26: +3.11.12 + * Add key validation to ssstablescrub (CASSANDRA-16969) + * Update Jackson from 2.9.10 to 2.12.5 (CASSANDRA-16851) + * Include SASI components to snapshots (CASSANDRA-15134) + * Make assassinate more resilient to missing tokens (CASSANDRA-16847) + * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies (CASSANDRA-16854) + * Validate SASI tokenizer options before adding index to schema (CASSANDRA-15135) + * Fixup scrub output when no data post-scrub and clear up old use of row, which really means partition (CASSANDRA-16835) + * Fix ant-junit dependency issue (CASSANDRA-16827) + * Reduce thread contention in CommitLogSegment and HintsBuffer (CASSANDRA-16072) + * Avoid sending CDC column if not enabled (CASSANDRA-16770) +Merged from 3.0: + * Don't take snapshots when truncating system tables (CASSANDRA-16839) * Make -Dtest.methods consistently optional in all Ant test targets (CASSANDRA-17014) * Immediately apply stream throughput, considering negative values as unthrottled (CASSANDRA-16959) * Do not release new SSTables in offline transactions (CASSANDRA-16975) diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java index 30cb400,e7c1868..4a74a2f --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@@ -2238,9 -2068,9 +2249,9 @@@ public class ColumnFamilyStore implemen viewManager.stopBuild(); final long truncatedAt; -final ReplayPosition replayAfter; +final CommitLogPosition replayAfter; - if (keyspace.getMetadata().params.durableWrites || DatabaseDescriptor.isAutoSnapshot()) + if (!noSnapshot && (keyspace.getMetadata().params.durableWrites || DatabaseDescriptor.isAutoSnapshot())) { replayAfter = forceBlockingFlush(); viewManager.forceBlockingFlush(); @@@ -2270,8 -2100,8 +2281,8 @@@ logger.debug("Discarding sstable data for truncated CF + indexes"); data.notifyTruncated(truncatedAt); - if (DatabaseDescriptor.isAutoSnapshot()) + if (!noSnapshot && DatabaseDescriptor.isAutoSnapshot()) -snapshot(Keyspace.getTimestampedSnapshotName(name)); +snapshot(Keyspace.getTimestampedSnapshotNameWithPrefix(name, SNAPSHOT_TRUNCATE_PREFIX)); discardSSTables(truncatedAt); diff --cc src/java/org/apache/cassandra/db/SystemKeyspace.java index 4ab81ae,dc550df..ec26a69 --- a/src/java/org/apache/cassandra/db/SystemKeyspace.java +++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java @@@ -1387,43 -1346,10 +1387,43 @@@ public final class SystemKeyspac public static void resetAvailableRanges() { -ColumnFamilyStore availableRanges = Keyspace.open(NAME).getColumnFamilyStore(AVAILABLE_RANGES); +ColumnFamilyStore availableRanges = Keyspace.open(SchemaConstants.SYSTEM_KEYSPACE_NAME).getColumnFamilyStore(AVAILABLE_RANGES); - availableRanges.truncateBlocking(); + availableRanges.truncateBlockingWithoutSnapshot(); } +public static synchronized void updateTransferredRanges(String description, + InetAddress peer, + String keyspace, + Collection> streamedRanges) +{ +String cql = "UPDATE system.%s SET ranges = ranges + ? WHERE operation = ? AND peer = ? AND keyspace_name = ?"; +Set rangesToUpdate = new HashSet<>(streamedRanges.size()); +for (Range range : streamedRanges) +{ +rangesToUpdate.add(rangeToBytes(range)); +} +executeInternal(String.format(cql, TRANSFERRED_RANGES), rangesToUpdate, description, peer, keyspace); +} + +public static synchronized Map>> getTransferredRanges(String description, String keyspace, IPartitioner partitioner) +{ +Map>> result = new HashMap<>(); +String query = "SELECT * FROM system.%s WHERE operation = ? AND keyspace_name = ?"; +UntypedResultSet rs = execut
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. maedhroz pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit a136517211342621be2dadd5d53affb2e4fbf583 Merge: 32a15f0 35446dc Author: Caleb Rackliffe AuthorDate: Mon Oct 4 14:58:00 2021 -0500 Merge branch 'cassandra-3.0' into cassandra-3.11 .../cassandra/db/commitlog/AbstractCommitLogSegmentManager.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --cc src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java index df2e4f3,000..18b4374 mode 100755,00..100755 --- a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java +++ b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java @@@ -1,563 -1,0 +1,565 @@@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.cassandra.db.commitlog; + +import java.io.File; +import java.io.IOException; +import java.util.*; +import java.util.concurrent.*; +import java.util.concurrent.atomic.AtomicLong; +import java.util.function.BooleanSupplier; + +import com.google.common.annotations.VisibleForTesting; +import com.google.common.util.concurrent.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import net.nicoulaj.compilecommand.annotations.DontInline; +import org.apache.cassandra.concurrent.NamedThreadFactory; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.config.Schema; +import org.apache.cassandra.db.*; +import org.apache.cassandra.io.compress.BufferType; +import org.apache.cassandra.io.util.SimpleCachedBufferPool; +import org.apache.cassandra.utils.*; +import org.apache.cassandra.utils.concurrent.WaitQueue; + +import static org.apache.cassandra.db.commitlog.CommitLogSegment.Allocation; + +/** + * Performs eager-creation of commit log segments in a background thread. All the + * public methods are thread safe. + */ +public abstract class AbstractCommitLogSegmentManager +{ +static final Logger logger = LoggerFactory.getLogger(AbstractCommitLogSegmentManager.class); + +/** + * Segment that is ready to be used. The management thread fills this and blocks until consumed. + * + * A single management thread produces this, and consumers are already synchronizing to make sure other work is + * performed atomically with consuming this. Volatile to make sure writes by the management thread become + * visible (ordered/lazySet would suffice). Consumers (advanceAllocatingFrom and discardAvailableSegment) must + * synchronize on 'this'. + */ +private volatile CommitLogSegment availableSegment = null; + +private final WaitQueue segmentPrepared = new WaitQueue(); + +/** Active segments, containing unflushed data. The tail of this queue is the one we allocate writes to */ +private final ConcurrentLinkedQueue activeSegments = new ConcurrentLinkedQueue<>(); + +/** + * The segment we are currently allocating commit log records to. + * + * Written by advanceAllocatingFrom which synchronizes on 'this'. Volatile to ensure reads get current value. + */ +private volatile CommitLogSegment allocatingFrom = null; + +final String storageDirectory; + +/** + * Tracks commitlog size, in multiples of the segment size. We need to do this so we can "promise" size + * adjustments ahead of actually adding/freeing segments on disk, so that the "evict oldest segment" logic + * can see the effect of recycling segments immediately (even though they're really happening asynchronously + * on the manager thread, which will take a ms or two). + */ +private final AtomicLong size = new AtomicLong(); + +private Thread managerThread; +protected final CommitLog commitLog; +private volatile boolean shutdown; +private final BooleanSupplier managerThreadWaitCondition = () -> (availableSegment == null && !atSegmentBufferLimit()) || shutdown; +private final WaitQueue managerThreadWaitQueue = new WaitQueue(); + +private volatile Simp
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 2614f7eeb4343b1d752a16688a1dc55ab245ca8f Merge: c6e897d 0c46531 Author: Andrés de la Peña AuthorDate: Fri Oct 1 15:18:40 2021 +0100 Merge branch 'cassandra-3.0' into cassandra-3.11 CHANGES.txt | 1 + build.xml | 29 + 2 files changed, 22 insertions(+), 8 deletions(-) diff --cc CHANGES.txt index 37ec9c1,2ca4481..a40b226 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,15 -1,5 +1,16 @@@ -3.0.26: +3.11.12 + * Add key validation to ssstablescrub (CASSANDRA-16969) + * Update Jackson from 2.9.10 to 2.12.5 (CASSANDRA-16851) + * Include SASI components to snapshots (CASSANDRA-15134) + * Make assassinate more resilient to missing tokens (CASSANDRA-16847) + * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies (CASSANDRA-16854) + * Validate SASI tokenizer options before adding index to schema (CASSANDRA-15135) + * Fixup scrub output when no data post-scrub and clear up old use of row, which really means partition (CASSANDRA-16835) + * Fix ant-junit dependency issue (CASSANDRA-16827) + * Reduce thread contention in CommitLogSegment and HintsBuffer (CASSANDRA-16072) + * Avoid sending CDC column if not enabled (CASSANDRA-16770) +Merged from 3.0: + * Make -Dtest.methods consistently optional in all Ant test targets (CASSANDRA-17014) * Immediately apply stream throughput, considering negative values as unthrottled (CASSANDRA-16959) * Do not release new SSTables in offline transactions (CASSANDRA-16975) * ArrayIndexOutOfBoundsException in FunctionResource#fromName (CASSANDRA-16977, CASSANDRA-16995) diff --cc build.xml index 5c80b6d,c11a796..fe77098 --- a/build.xml +++ b/build.xml @@@ -1294,7 -1305,8 +1296,8 @@@ -- @@@ -1309,15 -1322,22 +1313,17 @@@ -- - + + - - - - - - + @@@ -1603,7 -1612,8 +1614,8 @@@ -- - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit c6e897d2d43bd8c2dff9553cee466231247b9840 Merge: 9bf14a6 4f8afe8 Author: Andrés de la Peña AuthorDate: Fri Oct 1 11:52:07 2021 +0100 Merge branch 'cassandra-3.0' into cassandra-3.11 CHANGES.txt| 1 + .../apache/cassandra/service/StorageService.java | 8 +- .../apache/cassandra/streaming/StreamManager.java | 58 +- .../tools/nodetool/SetInterDCStreamThroughput.java | 3 +- .../tools/nodetool/SetStreamThroughput.java| 3 +- .../cassandra/streaming/StreamManagerTest.java | 91 ++ 6 files changed, 142 insertions(+), 22 deletions(-) diff --cc CHANGES.txt index 84c5bcf,53858ac..37ec9c1 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,15 -1,5 +1,16 @@@ -3.0.26: +3.11.12 + * Add key validation to ssstablescrub (CASSANDRA-16969) + * Update Jackson from 2.9.10 to 2.12.5 (CASSANDRA-16851) + * Include SASI components to snapshots (CASSANDRA-15134) + * Make assassinate more resilient to missing tokens (CASSANDRA-16847) + * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies (CASSANDRA-16854) + * Validate SASI tokenizer options before adding index to schema (CASSANDRA-15135) + * Fixup scrub output when no data post-scrub and clear up old use of row, which really means partition (CASSANDRA-16835) + * Fix ant-junit dependency issue (CASSANDRA-16827) + * Reduce thread contention in CommitLogSegment and HintsBuffer (CASSANDRA-16072) + * Avoid sending CDC column if not enabled (CASSANDRA-16770) +Merged from 3.0: + * Immediately apply stream throughput, considering negative values as unthrottled (CASSANDRA-16959) * Do not release new SSTables in offline transactions (CASSANDRA-16975) * ArrayIndexOutOfBoundsException in FunctionResource#fromName (CASSANDRA-16977, CASSANDRA-16995) * CVE-2015-0886 Security vulnerability in jbcrypt is addressed (CASSANDRA-9384) diff --cc src/java/org/apache/cassandra/service/StorageService.java index 9cfdd80,78d1120..1a0d5b0 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@@ -1390,98 -1257,12 +1390,100 @@@ public class StorageService extends Not } } +public void setRpcTimeout(long value) +{ +DatabaseDescriptor.setRpcTimeout(value); +logger.info("set rpc timeout to {} ms", value); +} + +public long getRpcTimeout() +{ +return DatabaseDescriptor.getRpcTimeout(); +} + +public void setReadRpcTimeout(long value) +{ +DatabaseDescriptor.setReadRpcTimeout(value); +logger.info("set read rpc timeout to {} ms", value); +} + +public long getReadRpcTimeout() +{ +return DatabaseDescriptor.getReadRpcTimeout(); +} + +public void setRangeRpcTimeout(long value) +{ +DatabaseDescriptor.setRangeRpcTimeout(value); +logger.info("set range rpc timeout to {} ms", value); +} + +public long getRangeRpcTimeout() +{ +return DatabaseDescriptor.getRangeRpcTimeout(); +} + +public void setWriteRpcTimeout(long value) +{ +DatabaseDescriptor.setWriteRpcTimeout(value); +logger.info("set write rpc timeout to {} ms", value); +} + +public long getWriteRpcTimeout() +{ +return DatabaseDescriptor.getWriteRpcTimeout(); +} + +public void setCounterWriteRpcTimeout(long value) +{ +DatabaseDescriptor.setCounterWriteRpcTimeout(value); +logger.info("set counter write rpc timeout to {} ms", value); +} + +public long getCounterWriteRpcTimeout() +{ +return DatabaseDescriptor.getCounterWriteRpcTimeout(); +} + +public void setCasContentionTimeout(long value) +{ +DatabaseDescriptor.setCasContentionTimeout(value); +logger.info("set cas contention rpc timeout to {} ms", value); +} + +public long getCasContentionTimeout() +{ +return DatabaseDescriptor.getCasContentionTimeout(); +} + +public void setTruncateRpcTimeout(long value) +{ +DatabaseDescriptor.setTruncateRpcTimeout(value); +logger.info("set truncate rpc timeout to {} ms", value); +} + +public long getTruncateRpcTimeout() +{ +return DatabaseDescriptor.getTruncateRpcTimeout(); +} + +public void setStreamingSocketTimeout(int value) +{ +DatabaseDescriptor.setStreamingSocketTimeout(value); +logger.info("set streaming socket timeout to {} ms", value); +} + +public int getStreamingSocketTimeout() +{ +return DatabaseDescriptor.getStreamingSocketTimeout(); +} + public void setStreamThroughputMbPerSec(int val
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit dcc95492e9b05e1b8ceb3af332d5c0989c7272b0 Merge: 7c067b6 3e6faca Author: Andrés de la Peña AuthorDate: Thu Sep 30 13:07:26 2021 +0100 Merge branch 'cassandra-3.0' into cassandra-3.11 # Conflicts: # CHANGES.txt # src/java/org/apache/cassandra/db/compaction/CompactionTask.java CHANGES.txt| 1 + .../cassandra/db/compaction/CompactionTask.java| 81 +-- .../db/compaction/CompactionTaskTest.java | 91 ++ 3 files changed, 130 insertions(+), 43 deletions(-) diff --cc CHANGES.txt index 406efbc,6ef52e4..84c5bcf --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,15 -1,5 +1,16 @@@ -3.0.26: +3.11.12 + * Add key validation to ssstablescrub (CASSANDRA-16969) + * Update Jackson from 2.9.10 to 2.12.5 (CASSANDRA-16851) + * Include SASI components to snapshots (CASSANDRA-15134) + * Make assassinate more resilient to missing tokens (CASSANDRA-16847) + * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies (CASSANDRA-16854) + * Validate SASI tokenizer options before adding index to schema (CASSANDRA-15135) + * Fixup scrub output when no data post-scrub and clear up old use of row, which really means partition (CASSANDRA-16835) + * Fix ant-junit dependency issue (CASSANDRA-16827) + * Reduce thread contention in CommitLogSegment and HintsBuffer (CASSANDRA-16072) + * Avoid sending CDC column if not enabled (CASSANDRA-16770) +Merged from 3.0: + * Do not release new SSTables in offline transactions (CASSANDRA-16975) * ArrayIndexOutOfBoundsException in FunctionResource#fromName (CASSANDRA-16977, CASSANDRA-16995) * CVE-2015-0886 Security vulnerability in jbcrypt is addressed (CASSANDRA-9384) * Avoid useless SSTable reads during single partition queries (CASSANDRA-16944) diff --cc src/java/org/apache/cassandra/db/compaction/CompactionTask.java index 2efcd11,d29d5e6..b990020 --- a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java @@@ -233,50 -217,25 +233,45 @@@ public class CompactionTask extends Abs } } +if (transaction.isOffline()) - { - Refs.release(Refs.selfRefs(newSStables)); - } - else - { - // log a bunch of statistics about the result and save to system table compaction_history - - long durationInNano = System.nanoTime() - start; - long dTime = TimeUnit.NANOSECONDS.toMillis(durationInNano); - long startsize = inputSizeBytes; - long endsize = SSTableReader.getTotalBytes(newSStables); - double ratio = (double) endsize / (double) startsize; - - StringBuilder newSSTableNames = new StringBuilder(); - for (SSTableReader reader : newSStables) - newSSTableNames.append(reader.descriptor.baseFilename()).append(","); - long totalSourceRows = 0; - for (int i = 0; i < mergedRowCounts.length; i++) - totalSourceRows += mergedRowCounts[i] * (i + 1); - - String mergeSummary = updateCompactionHistory(cfs.keyspace.getName(), cfs.getTableName(), mergedRowCounts, startsize, endsize); - logger.debug(String.format("Compacted (%s) %d sstables to [%s] to level=%d. %s to %s (~%d%% of original) in %,dms. Read Throughput = %s, Write Throughput = %s, Row Throughput = ~%,d/s. %,d total partitions merged to %,d. Partition merge counts were {%s}", -taskId, -transaction.originals().size(), -newSSTableNames.toString(), -getLevel(), - FBUtilities.prettyPrintMemory(startsize), - FBUtilities.prettyPrintMemory(endsize), -(int) (ratio * 100), -dTime, - FBUtilities.prettyPrintMemoryPerSecond(startsize, durationInNano), - FBUtilities.prettyPrintMemoryPerSecond(endsize, durationInNano), -(int) totalSourceCQLRows / (TimeUnit.NANOSECONDS.toSeconds(durationInNano) + 1), -totalSourceRows, -totalKeysWritten, -mergeSummary)); - logger.trace("CF Total Bytes Compacted: {}",
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit dbe84e53df01000140601ab4ff10ed4a3c726f32 Merge: 4d64ff7 b6678a0 Author: Andrés de la Peña AuthorDate: Tue Sep 28 17:46:21 2021 +0100 Merge branch 'cassandra-3.0' into cassandra-3.11 .circleci/config-2_1.yml | 8 .circleci/generate.sh| 109 +-- .circleci/readme.md | 30 + 3 files changed, 135 insertions(+), 12 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 6a3440bd6174948461a33e274f675bd8d26688a0 Merge: 1aa7fb1 af85e7a Author: Andrés de la Peña AuthorDate: Fri Sep 24 11:42:21 2021 +0100 Merge branch 'cassandra-3.0' into cassandra-3.11 test/unit/org/apache/cassandra/cql3/ViewTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 9dbebb0b6fb83bad54b1a123b1ae94160336de5d Merge: 876f7b0 ea3cca0 Author: Brandon Williams AuthorDate: Tue Sep 21 09:24:05 2021 -0500 Merge branch 'cassandra-3.0' into cassandra-3.11 CHANGES.txt | 1 + debian/init | 6 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --cc CHANGES.txt index 41fe427,432faa8..e70d3d7 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -1,5 +1,15 @@@ -3.0.26: +3.11.12 + * Update Jackson from 2.9.10 to 2.12.5 (CASSANDRA-16851) + * Include SASI components to snapshots (CASSANDRA-15134) + * Make assassinate more resilient to missing tokens (CASSANDRA-16847) + * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies (CASSANDRA-16854) + * Validate SASI tokenizer options before adding index to schema (CASSANDRA-15135) + * Fixup scrub output when no data post-scrub and clear up old use of row, which really means partition (CASSANDRA-16835) + * Fix ant-junit dependency issue (CASSANDRA-16827) + * Reduce thread contention in CommitLogSegment and HintsBuffer (CASSANDRA-16072) + * Avoid sending CDC column if not enabled (CASSANDRA-16770) +Merged from 3.0: + * Debian init respects CASSANDRA_HEAPDUMP_DIR (CASSANDRA-13843) * Catch UnsatisfiedLinkError in WindowsTimer (CASSANDRA-16085) * Avoid removing batch when it's not created during view replication (CASSANDRA-16175) * Make the addition of regular column to COMPACT tables throw an InvalidRequestException (CASSANDRA-14564) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit d37a96735b8a512c61bbc70e365708185a884596 Merge: 32194ec be649d5 Author: Brandon Williams AuthorDate: Wed Sep 15 13:41:01 2021 -0500 Merge branch 'cassandra-3.0' into cassandra-3.11 CHANGES.txt | 2 ++ src/java/org/apache/cassandra/utils/WindowsTimer.java | 11 +++ 2 files changed, 13 insertions(+) diff --cc CHANGES.txt index f589208,94340d8..2416635 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,12 -1,6 +1,14 @@@ -3.0.26: +3.11.12 + * Make assassinate more resilient to missing tokens (CASSANDRA-16847) + * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies (CASSANDRA-16854) + * Validate SASI tokenizer options before adding index to schema (CASSANDRA-15135) + * Fixup scrub output when no data post-scrub and clear up old use of row, which really means partition (CASSANDRA-16835) + * Fix ant-junit dependency issue (CASSANDRA-16827) + * Reduce thread contention in CommitLogSegment and HintsBuffer (CASSANDRA-16072) + * Avoid sending CDC column if not enabled (CASSANDRA-16770) +Merged from 3.0: + * Catch UnsatisfiedLinkError in WindowsTimer (CASSANDRA-16085) + * Avoid removing batch when it's not created during view replication (CASSANDRA-16175) * Make the addition of regular column to COMPACT tables throw an InvalidRequestException (CASSANDRA-14564) * Fix materialized view schema backup as table (CASSANDRA-12734) * Avoid signaling DigestResolver until the minimum number of responses are guaranteed to be visible (CASSANDRA-16883) diff --cc src/java/org/apache/cassandra/utils/WindowsTimer.java index bbd162c,f004979..726f9d0 --- a/src/java/org/apache/cassandra/utils/WindowsTimer.java +++ b/src/java/org/apache/cassandra/utils/WindowsTimer.java @@@ -54,8 -61,10 +61,10 @@@ public final class WindowsTime if (period == 0) return; assert(period > 0); + if (!available) + return; if (timeBeginPeriod(period) != 0) -logger.warn("Failed to set timer to : " + period + ". Performance will be degraded."); +logger.warn("Failed to set timer to : {}. Performance will be degraded.", period); } public static void endTimerPeriod(int period) @@@ -63,7 -72,9 +72,9 @@@ if (period == 0) return; assert(period > 0); + if (!available) + return; if (timeEndPeriod(period) != 0) -logger.warn("Failed to end accelerated timer period. System timer will remain set to: " + period + " ms."); +logger.warn("Failed to end accelerated timer period. System timer will remain set to: {} ms.", period); } } - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 32194ec8d060920570f48fa9982e13b67f140e85 Merge: 5cdddcf b6f0864 Author: Mick Semb Wever AuthorDate: Sat Sep 11 00:05:06 2021 +0200 Merge branch 'cassandra-3.0' into cassandra-3.11 build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --cc build.xml index 34bca92,3e77a95..db2d64c --- a/build.xml +++ b/build.xml @@@ -364,11 -339,14 +364,11 @@@ - + - - - - + - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit ecf186f8592f73c5268caf408ca7742a3355bf5c Merge: d6e1c41 615372f Author: Brandon Williams AuthorDate: Fri Sep 3 13:48:32 2021 -0500 Merge branch 'cassandra-3.0' into cassandra-3.11 CHANGES.txt | 2 ++ redhat/cassandra.spec | 5 + 2 files changed, 7 insertions(+) diff --cc CHANGES.txt index 774cb5e,e96e1fa..dc7563f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -13,22 -6,11 +13,24 @@@ Merged from 3.0 * Use JMX to validate nodetool --jobs parameter (CASSANDRA-16104) * Handle properly UnsatisfiedLinkError in NativeLibrary#getProcessID() (CASSANDRA-16578) * Remove mutation data from error log message (CASSANDRA-16817) + Merged from 2.2: + * Add python2 location to RPMs (CASSANDRA-16822) -3.0.25: +3.11.11 + * Make cqlsh use the same set of reserved keywords than the server uses (CASSANDRA-15663) + * Optimize bytes skipping when reading SSTable files (CASSANDRA-14415) + * Enable tombstone compactions when unchecked_tombstone_compaction is set in TWCS (CASSANDRA-14496) + * Read only the required SSTables for single partition queries (CASSANDRA-16737) + * Fix LeveledCompactionStrategy compacts last level throw an ArrayIndexOutOfBoundsException (CASSANDRA-15669) + * Maps $CASSANDRA_LOG_DIR to cassandra.logdir java property when executing nodetool (CASSANDRA-16199) + * Nodetool garbagecollect should retain SSTableLevel for LCS (CASSANDRA-16634) + * Ignore stale acks received in the shadow round (CASSANDRA-16588) + * Add autocomplete and error messages for provide_overlapping_tombstones (CASSANDRA-16350) + * Add StorageServiceMBean.getKeyspaceReplicationInfo(keyspaceName) (CASSANDRA-16447) + * Make sure sstables with moved starts are removed correctly in LeveledGenerations (CASSANDRA-16552) + * Upgrade jackson-databind to 2.9.10.8 (CASSANDRA-16462) +Merged from 3.0: * Binary releases no longer bundle the apidocs (javadoc) (CASSANDRA-16557) * Migrate dependency handling from maven-ant-tasks to resolver-ant-tasks, removing lib/ directory from version control (CASSANDRA-16557) * Don't allow seeds to replace without using unsafe (CASSANDRA-14463) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 595596e5eec74709c00a5876361262e680a7ab09 Merge: e562118 e4b37c3 Author: Andrés de la Peña AuthorDate: Wed Sep 1 15:29:07 2021 +0100 Merge branch 'cassandra-3.0' into cassandra-3.11 .circleci/generate.sh | 95 --- .circleci/readme.md | 46 ++--- 2 files changed, 110 insertions(+), 31 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
This is an automated email from the ASF dual-hosted git repository. maedhroz pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit e5621184d86ac0c8d0c9870786c44baaadfb446a Merge: 1038f44 f9d41ff Author: Caleb Rackliffe AuthorDate: Tue Aug 31 16:24:27 2021 -0500 Merge branch 'cassandra-3.0' into cassandra-3.11 CHANGES.txt| 1 + .../apache/cassandra/service/DigestResolver.java | 8 +- .../org/apache/cassandra/service/ReadCallback.java | 13 +- .../service/reads/DigestResolverTest.java | 164 + 4 files changed, 180 insertions(+), 6 deletions(-) diff --cc CHANGES.txt index aa0ad38,434c1d2..3f7c23a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,5 +1,12 @@@ -3.0.26: +3.11.12 + * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies (CASSANDRA-16854) + * Validate SASI tokenizer options before adding index to schema (CASSANDRA-15135) + * Fixup scrub output when no data post-scrub and clear up old use of row, which really means partition (CASSANDRA-16835) + * Fix ant-junit dependency issue (CASSANDRA-16827) + * Reduce thread contention in CommitLogSegment and HintsBuffer (CASSANDRA-16072) + * Avoid sending CDC column if not enabled (CASSANDRA-16770) +Merged from 3.0: + * Avoid signaling DigestResolver until the minimum number of responses are guaranteed to be visible (CASSANDRA-16883) * Fix secondary indexes on primary key columns skipping some writes (CASSANDRA-16868) * Fix incorrect error message in LegacyLayout (CASSANDRA-15136) * Use JMX to validate nodetool --jobs parameter (CASSANDRA-16104) diff --cc test/unit/org/apache/cassandra/service/reads/DigestResolverTest.java index 000,d246a83..dd97aaa mode 00,100644..100644 --- a/test/unit/org/apache/cassandra/service/reads/DigestResolverTest.java +++ b/test/unit/org/apache/cassandra/service/reads/DigestResolverTest.java @@@ -1,0 -1,164 +1,164 @@@ + /* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + package org.apache.cassandra.service.reads; + + import java.net.UnknownHostException; + import java.util.concurrent.CountDownLatch; + import java.util.concurrent.ExecutorService; + import java.util.concurrent.Executors; + import java.util.concurrent.TimeUnit; + + import com.google.common.collect.ImmutableList; + import org.junit.BeforeClass; + import org.junit.Test; + + import org.apache.cassandra.SchemaLoader; + import org.apache.cassandra.Util; + import org.apache.cassandra.config.CFMetaData; + import org.apache.cassandra.config.DatabaseDescriptor; + import org.apache.cassandra.db.*; + import org.apache.cassandra.db.marshal.AsciiType; + import org.apache.cassandra.db.marshal.BytesType; + import org.apache.cassandra.db.partitions.PartitionIterator; + import org.apache.cassandra.db.partitions.PartitionUpdate; + import org.apache.cassandra.db.partitions.SingletonUnfilteredPartitionIterator; + import org.apache.cassandra.db.partitions.UnfilteredPartitionIterator; + import org.apache.cassandra.db.rows.*; + import org.apache.cassandra.dht.Murmur3Partitioner; + import org.apache.cassandra.locator.InetAddressAndPort; + import org.apache.cassandra.schema.KeyspaceParams; + import org.apache.cassandra.service.DigestMismatchException; + import org.apache.cassandra.service.DigestResolver; + import org.apache.cassandra.service.ReadCallback; + import org.apache.cassandra.utils.FBUtilities; + + import static org.apache.cassandra.utils.ByteBufferUtil.bytes; + import static org.junit.Assert.assertTrue; + + public class DigestResolverTest + { + public static final String KEYSPACE1 = "DigestResolverTest"; + public static final String CF_STANDARD = "Standard1"; + + private static Keyspace ks; + private static CFMetaData cfm; + + private static final InetAddressAndPort EP1; + private static final InetAddressAndPort EP2; + + static + { + try + { + EP1 = InetAddressAndPort.getByName("127.0.0.1"); + EP2 = InetAddressAndPort.getByName("127.0.0.2"); + } + catch (UnknownHostException e) + { + throw new Runti