(cassandra) 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 0662094b84c13db8046ef51964551f2e0288dfcd Merge: 53f07f9610 2856a34636 Author: Brandon Williams AuthorDate: Tue Apr 16 13:27:12 2024 -0500 Merge branch 'cassandra-3.11' into cassandra-4.0 - 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 53f07f96103959c69c7fa4144eb9b1fe56fd194d Merge: fd46d400b5 7af7f42f5f Author: Brandon Williams AuthorDate: Mon Apr 15 11:25:18 2024 -0500 Merge branch 'cassandra-3.11' into cassandra-4.0 - 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit fd46d400b5e96e592f6d00b0c3d558c683d6d366 Merge: 9a1d7912ef d079952c50 Author: Brandon Williams AuthorDate: Fri Apr 12 13:50:34 2024 -0500 Merge branch 'cassandra-3.11' into cassandra-4.0 - 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 9a1d7912efcebe7555142876f7052c0e2faa22b2 Merge: 0974a3656d a766c18481 Author: Brandon Williams AuthorDate: Thu Apr 11 13:51:08 2024 -0500 Merge branch 'cassandra-3.11' into cassandra-4.0 - 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit f0aa6744d2390535476a928d666f01482b3b7796
Merge: c73683c1a8 338e4ed618
Author: Brandon Williams
AuthorDate: Wed Apr 3 16:48:49 2024 -0500
Merge branch 'cassandra-3.11' into cassandra-4.0
doc/modules/cassandra/examples/BASH/add_repo_keys.sh | 2 +-
doc/modules/cassandra/examples/BASH/get_deb_package.sh | 2 +-
doc/modules/cassandra/partials/package_versions.adoc | 15 ++-
3 files changed, 12 insertions(+), 7 deletions(-)
diff --cc doc/modules/cassandra/examples/BASH/get_deb_package.sh
index 544512280a,ab34c32a98..3512c37c61
--- a/doc/modules/cassandra/examples/BASH/get_deb_package.sh
+++ b/doc/modules/cassandra/examples/BASH/get_deb_package.sh
@@@ -1,2 -1,2 +1,2 @@@
- $ echo "deb https://debian.cassandra.apache.org 40x main" | sudo tee -a
/etc/apt/sources.list.d/cassandra.sources.list
-$ echo "deb [signed-by=/etc/apt/keyrings/apache-cassandra.asc]
https://debian.cassandra.apache.org 311x main" | sudo tee -a
/etc/apt/sources.list.d/cassandra.sources.list
-deb https://debian.cassandra.apache.org 311x main
++$ echo "deb [signed-by=/etc/apt/keyrings/apache-cassandra.asc]
https://debian.cassandra.apache.org 40x main" | sudo tee -a
/etc/apt/sources.list.d/cassandra.sources.list
+deb https://debian.cassandra.apache.org 40x main
diff --cc doc/modules/cassandra/partials/package_versions.adoc
index 12eab03eb5,406ae9cc59..a5c7bfe67c
--- a/doc/modules/cassandra/partials/package_versions.adoc
+++ b/doc/modules/cassandra/partials/package_versions.adoc
@@@ -1,5 -1,10 +1,10 @@@
- The latest major version is {40_version} and the
- corresponding distribution name is `40x` (with an "x" as the suffix).
- For older releases use `311x` for C* {3x_version} series, `30x` for
{30_version}, `22x`
- for {22_version} and `21x` for {21_version}. For example, to add the
repository for
- version {40_version} (`40x`):
-The latest major version is {311_version} and the corresponding distribution
name is `311x` (with an "x" as the suffix).
++The latest major version is {40_version} and the corresponding distribution
name is `40x` (with an "x" as the suffix).
+ For older releases use:
+
++* `40x` for C* {40_version} series
+ * `311x` for C* {311_version} series
+ * `30x` for C* {30_version} series
+ * `22x` for C* {22_version} series
+ * `21x` for C* {21_version} series
-* `20x` for C* {20_version} series
+
-For example, to add the repository for version {311_version} (`311x`):
++For example, to add the repository for version {40_version} (`40x`):
-
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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 8e5fc74c9a3d734bfded9bde3fff399d4b67d65a Merge: e1b0b44f9e 2e3d7e76f5 Author: Brandon Williams AuthorDate: Wed Dec 6 06:32:32 2023 -0600 Merge branch 'cassandra-3.11' into cassandra-4.0 .build/dependency-check-suppressions.xml | 9 + CHANGES.txt | 1 + 2 files changed, 10 insertions(+) diff --cc .build/dependency-check-suppressions.xml index d806926aaf,774e2e7886..0c32a06b17 --- a/.build/dependency-check-suppressions.xml +++ b/.build/dependency-check-suppressions.xml @@@ -62,6 -96,17 +62,15 @@@ 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 f79af3a59b,96e34db044..771cf1f3c0 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -20,8 -2,8 +20,9 @@@ Merged from 3.11 * 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) + * Moved jflex from runtime to build dependencies (CASSANDRA-18664) 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit a912085f5eea21bfae2cba8185ffb5f30c54cfc3 Merge: fe1be800b4 46996c24bf Author: Brandon Williams AuthorDate: Mon Nov 13 14:16:00 2023 -0600 Merge branch 'cassandra-3.11' into cassandra-4.0 bin/cqlsh.py | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --cc bin/cqlsh.py index 6dae2d03fe,e3b8fce225..dddbd397fa mode 100755,100644..100755 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py - 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository.
blambov pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit c6385ac3ddccabdc7cb650b090fa69c0523274e8
Merge: 31aede3275 87c2af85c1
Author: Branimir Lambov
AuthorDate: Thu Sep 21 16:02:01 2023 +0300
Merge branch 'cassandra-3.11' into cassandra-4.0
CHANGES.txt| 1 +
.../db/compaction/CompactionController.java| 12 +-
.../db/compaction/CompactionControllerTest.java| 141 -
3 files changed, 146 insertions(+), 8 deletions(-)
diff --cc CHANGES.txt
index 13de2ab602,74755be6e7..6c4e0ef6b0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,7 +1,13 @@@
-3.11.17
+4.0.12
+ * Enable 3rd party JDK installations for Debian package (CASSANDRA-18844)
+ * Fix NTS log message when an unrecognized strategy option is passed
(CASSANDRA-18679)
+ * Fix BulkLoader ignoring cipher suites options (CASSANDRA-18582)
+ * Migrate Python optparse to argparse (CASSANDRA-17914)
+Merged from 3.11:
+ * 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)
+ * Moved jflex from runtime to build dependencies (CASSANDRA-18664)
Merged from 3.0:
* Add cqlshrc.sample and credentials.sample into Debian package
(CASSANDRA-18818)
* Refactor validation logic in StorageService.rebuild (CASSANDRA-18803)
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionController.java
index cee2b58f75,06272a1075..0c520d9491
--- a/src/java/org/apache/cassandra/db/compaction/CompactionController.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionController.java
@@@ -73,7 -81,11 +73,9 @@@ public class CompactionController exten
public CompactionController(ColumnFamilyStore cfs, Set
compacting, int gcBefore, RateLimiter limiter, TombstoneOption tombstoneOption)
{
+ //When making changes to the method, be aware that some of the state
of the controller may still be uninitialized
+ //(e.g. TWCS sets up the value of ignoreOverlaps() after this
completes)
-assert cfs != null;
-this.cfs = cfs;
-this.gcBefore = gcBefore;
+super(cfs, gcBefore, tombstoneOption);
this.compacting = compacting;
this.limiter = limiter;
compactingRepaired = compacting != null &&
compacting.stream().allMatch(SSTableReader::isRepaired);
@@@ -94,18 -107,6 +96,12 @@@
return;
}
- if (ignoreOverlaps())
- {
- logger.debug("not refreshing overlaps - running with
ignoreOverlaps activated");
- return;
- }
-
+if (cfs.getNeverPurgeTombstones())
+{
+logger.debug("not refreshing overlaps for {}.{} -
neverPurgeTombstones is enabled", cfs.keyspace.getName(), cfs.getTableName());
+return;
+}
+
for (SSTableReader reader : overlappingSSTables)
{
if (reader.isMarkedCompacted())
diff --cc
test/unit/org/apache/cassandra/db/compaction/CompactionControllerTest.java
index 500a88179f,aa95ba56fb..86546bb9f6
--- a/test/unit/org/apache/cassandra/db/compaction/CompactionControllerTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/CompactionControllerTest.java
@@@ -19,13 -19,19 +19,19 @@@
package org.apache.cassandra.db.compaction;
import java.nio.ByteBuffer;
+ import java.util.HashMap;
+ import java.util.Map;
import java.util.Set;
+ import java.util.concurrent.CountDownLatch;
+ import java.util.concurrent.TimeUnit;
-import java.util.function.Predicate;
+import java.util.function.LongPredicate;
- import java.util.function.Predicate;
+ import com.google.common.collect.Iterables;
import com.google.common.collect.Sets;
+ import com.google.common.util.concurrent.Uninterruptibles;
import org.junit.BeforeClass;
import org.junit.Test;
+ import org.junit.runner.RunWith;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
@@@ -183,7 -201,125 +199,125 @@@ public class CompactionControllerTest e
assertEquals(1, expired.size());
}
+ @Test
+ @BMRules(rules = {
+ @BMRule(name = "Pause compaction",
+ targetClass = "CompactionTask",
+ targetMethod = "runMayThrow",
+ targetLocation = "INVOKE getCompactionAwareWriter",
+ condition = "Thread.currentThread().getName().equals(\"compaction1\")",
+ action =
"org.apache.cassandra.db.compaction.CompactionControllerTest.createCompactionControllerLatch.countDown();"
+
+
"com.google.common.util.concurrent.Uninterruptibles.awaitUninterruptibly" +
+
"(org.apache.cassandra.db.compact
[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit edde699a062701345133b6f0648a744b426a6f94
Merge: b2093ef321 edf22ed776
Author: Brandon Williams
AuthorDate: Fri Sep 15 12:22:53 2023 -0500
Merge branch 'cassandra-3.11' into cassandra-4.0
CHANGES.txt | 1 +
src/java/org/apache/cassandra/gms/Gossiper.java | 47 ++---
2 files changed, 4 insertions(+), 44 deletions(-)
diff --cc CHANGES.txt
index 4a3f90770a,2d9e2059e1..62c49d6fd0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,6 +1,11 @@@
-3.11.17
+4.0.12
+ * Fix NTS log message when an unrecognized strategy option is passed
(CASSANDRA-18679)
+ * Fix BulkLoader ignoring cipher suites options (CASSANDRA-18582)
+ * Migrate Python optparse to argparse (CASSANDRA-17914)
+Merged from 3.11:
+ * Revert CASSANDRA-18543 (CASSANDRA-18854)
* Fix NPE when using udfContext in UDF after a restart of a node
(CASSANDRA-18739)
+ * Moved jflex from runtime to build dependencies (CASSANDRA-18664)
Merged from 3.0:
* Add cqlshrc.sample and credentials.sample into Debian package
(CASSANDRA-18818)
* Refactor validation logic in StorageService.rebuild (CASSANDRA-18803)
diff --cc src/java/org/apache/cassandra/gms/Gossiper.java
index ad9c8c3784,b3783cd5b5..2b3c48ed77
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@@ -38,15 -38,8 +38,14 @@@ import com.google.common.collect.Sets
import com.google.common.util.concurrent.ListenableFutureTask;
import com.google.common.util.concurrent.Uninterruptibles;
-import io.netty.util.concurrent.FastThreadLocal;
+import org.apache.cassandra.concurrent.JMXEnabledSingleThreadExecutor;
+import org.apache.cassandra.config.CassandraRelevantProperties;
- import org.apache.cassandra.exceptions.RequestFailureReason;
+import org.apache.cassandra.locator.InetAddressAndPort;
+import org.apache.cassandra.net.NoPayload;
+import org.apache.cassandra.net.Verb;
+import org.apache.cassandra.utils.CassandraVersion;
import org.apache.cassandra.utils.ExecutorUtils;
+import org.apache.cassandra.utils.ExpiringMemoizingSupplier;
import org.apache.cassandra.utils.MBeanWrapper;
import org.apache.cassandra.utils.NoSpamLogger;
import org.apache.cassandra.utils.Pair;
@@@ -127,21 -119,24 +126,18 @@@ public class Gossiper implements IFailu
// Maximimum difference between generation value and local time we are
willing to accept about a peer
static final int MAX_GENERATION_DIFFERENCE = 86400 * 365;
-private long fatClientTimeout;
+private final long fatClientTimeout;
private final Random random = new Random();
-private final Comparator inetcomparator = new
Comparator()
-{
-public int compare(InetAddress addr1, InetAddress addr2)
-{
-return addr1.getHostAddress().compareTo(addr2.getHostAddress());
-}
-};
/* subscribers for interest in EndpointState change */
-private final List subscribers = new
CopyOnWriteArrayList();
+private final List subscribers = new
CopyOnWriteArrayList<>();
/* live member set */
-private final Set liveEndpoints = new
ConcurrentSkipListSet(inetcomparator);
+@VisibleForTesting
+final Set liveEndpoints = new
ConcurrentSkipListSet<>();
- /* Inflight echo requests. */
- private final Set inflightEcho = new
ConcurrentSkipListSet<>();
-
/* unreachable member set */
-private final Map unreachableEndpoints = new
ConcurrentHashMap();
+private final Map unreachableEndpoints = new
ConcurrentHashMap<>();
/* initial seeds for joining the cluster */
@VisibleForTesting
@@@ -638,14 -529,12 +634,13 @@@
}
liveEndpoints.remove(endpoint);
- inflightEcho.remove(endpoint);
unreachableEndpoints.remove(endpoint);
-MessagingService.instance().resetVersion(endpoint);
+MessagingService.instance().versions.reset(endpoint);
quarantineEndpoint(endpoint);
-MessagingService.instance().destroyConnectionPool(endpoint);
-if (logger.isDebugEnabled())
-logger.debug("removing endpoint {}", endpoint);
+MessagingService.instance().closeOutbound(endpoint);
+MessagingService.instance().removeInbound(endpoint);
+logger.debug("removing endpoint {}", endpoint);
+GossiperDiagnostics.removedEndpoint(this, endpoint);
}
/**
@@@ -1279,52 -1118,32 +1274,20 @@@
}
-private void markAlive(final InetAddress addr, final EndpointState
localState)
+private void markAlive(final InetAddressAndPort addr, final EndpointState
localState)
{
- if (inflightEcho.contains(addr))
-if (MessagingService.instance().getVersion(addr) <
[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit aa2494b30b8a1f19552d202991dc8039109eae58 Merge: 94043fa9c6 14e89fc3c7 Author: Mick Semb Wever AuthorDate: Thu Aug 31 22:37:33 2023 +0200 Merge branch 'cassandra-3.11' into cassandra-4.0 * cassandra-3.11: Missing license info and headers .build/build-rat.xml | 89 -- .jenkins/Jenkinsfile | 13 ++-- LICENSE.txt| 18 - build.properties.default | 19 + conf/cassandra-jaas.config | 16 conf/jvm-clients.options | 18 + conf/jvm-server.options| 18 + conf/jvm11-clients.options | 18 + conf/jvm11-server.options | 18 + conf/jvm8-clients.options | 18 + conf/jvm8-server.options | 18 + debian/cassandra.conf | 17 + debian/cassandra.postinst | 19 + debian/default | 18 + debian/init| 18 + debian/nodetool-completion | 17 + debian/rules | 19 - eclipse_compiler.properties| 17 + pylib/Dockerfile.ubuntu.py2| 17 + pylib/Dockerfile.ubuntu.py3| 16 pylib/Dockerfile.ubuntu.py37 | 11 +++ pylib/Dockerfile.ubuntu.py38 | 11 +++ pylib/cqlshlib/setup.cfg | 17 + pylib/pytest.ini | 17 + pylib/requirements.txt | 18 + redhat/cassandra | 17 + redhat/cassandra.conf | 17 + redhat/default | 17 + .../cassandra/cql3/functions/JavaSourceUDF.txt | 17 + 29 files changed, 513 insertions(+), 50 deletions(-) diff --cc .build/build-rat.xml index cab1d4f895,93133dc63c..09c7fd2041 --- a/.build/build-rat.xml +++ b/.build/build-rat.xml @@@ -51,34 -41,53 +41,55 @@@ - - - - - - - - - - - - - - - - - - - - - - - - ++ + ++ + - - ++ + - - ++ ++ ++ ++ + ++ + + + + + + + + + + + + + + + - - - - - ++ + + + + + ++ + + + + + - + - + + + + + + + - ++ diff --cc LICENSE.txt index 1b0f46f767,d5c4984908..5211e7dc27 --- a/LICENSE.txt +++ b/LICENSE.txt @@@ -202,39 -202,8 +202,51 @@@ limitations under the License. -THIRD-PARTY DEPENDENCIES - -Convenience copies of some third-party dependencies are distributed with -Apache Cassandra as Java jar files in lib/. Licensing information for -these files can be found in the lib/licenses directory. + APACHE CASSANDRA SUBCOMPONENTS: + + Apache Cassandra includes a number of subcomponents with + separate copyright notices and license terms. Your use of the source + code for these subcomponents is subject to the terms and + conditions of the following licenses. + -This
[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository.
jonmeredith pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 4034fbb6dd4b9026b5227458a63c82e7e8075459
Merge: d13b3ef61b c6d7d070c5
Author: Jon Meredith
AuthorDate: Thu Aug 24 16:32:51 2023 -0600
Merge branch 'cassandra-3.11' into cassandra-4.0
build.xml | 5 +-
.../utils/RMIClientSocketFactoryImpl.java | 22 +-
.../apache/cassandra/utils/ReflectionUtils.java| 46 +++-
.../cassandra/distributed/impl/Instance.java | 5 +-
.../cassandra/distributed/impl/IsolatedJmx.java| 87 +-
.../cassandra/distributed/shared/ClusterUtils.java | 34 +++--
.../distributed/test/ResourceLeakTest.java | 54 --
.../distributed/test/jmx/JMXFeatureTest.java | 85 ++---
.../distributed/test/jmx/JMXGetterCheckTest.java | 46 +---
9 files changed, 262 insertions(+), 122 deletions(-)
diff --cc build.xml
index 0b914175bb,70a195f98d..5812360e27
--- a/build.xml
+++ b/build.xml
@@@ -176,111 -160,6 +176,112 @@@
}
+
+
+
+
+
+
+
+
+
+
+
+
+-Djdk.attach.allowAttachSelf=true
+
+-XX:+UseConcMarkSweepGC
+-XX:+CMSParallelRemarkEnabled
+-XX:SurvivorRatio=8
+-XX:MaxTenuringThreshold=1
+-XX:CMSInitiatingOccupancyFraction=75
+-XX:+UseCMSInitiatingOccupancyOnly
+-XX:CMSWaitDuration=1
+-XX:+CMSParallelInitialMarkEnabled
+-XX:+CMSEdenChunksRecordAlways
+
+--add-exports java.base/jdk.internal.misc=ALL-UNNAMED
+--add-exports java.base/jdk.internal.ref=ALL-UNNAMED
+--add-exports java.base/sun.nio.ch=ALL-UNNAMED
+--add-exports
java.management.rmi/com.sun.jmx.remote.internal.rmi=ALL-UNNAMED
+--add-exports java.rmi/sun.rmi.registry=ALL-UNNAMED
+--add-exports java.rmi/sun.rmi.server=ALL-UNNAMED
++--add-exports java.rmi/sun.rmi.transport=ALL-UNNAMED
+--add-exports
java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED
+--add-exports java.sql/java.sql=ALL-UNNAMED
+
+--add-opens java.base/java.lang.module=ALL-UNNAMED
+--add-opens java.base/java.net=ALL-UNNAMED
+--add-opens java.base/jdk.internal.loader=ALL-UNNAMED
+--add-opens java.base/jdk.internal.ref=ALL-UNNAMED
+--add-opens
java.base/jdk.internal.reflect=ALL-UNNAMED
+--add-opens java.base/jdk.internal.math=ALL-UNNAMED
+--add-opens java.base/jdk.internal.module=ALL-UNNAMED
+--add-opens
java.base/jdk.internal.util.jar=ALL-UNNAMED
+--add-opens
jdk.management/com.sun.management.internal=ALL-UNNAMED
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+-XX:-CMSClassUnloadingEnabled
+-Dio.netty.tryReflectionSetAccessible=true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@@ -552,35 -383,30 +553,35 @@@
+
+
+
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
-
+
-
-
+
+
-
-
-
-
+
+
+
+
@@@ -2003,32 -1752,13 +2004,32 @@@
+
+
+
+
+
+
+
+
+
-
+
-
+
+
+
Apache Cassandra ${eclipse.project.name}
[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit bf9d334f54e1114e7df4cc6c9ef6e4bb6bde1054 Merge: 197e806f64 b21645474a Author: Brandon Williams AuthorDate: Fri Aug 18 13:57:18 2023 -0500 Merge branch 'cassandra-3.11' into cassandra-4.0 bin/cqlsh.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --cc bin/cqlsh.py index 4ca4469604,e1a7ea8561..f717807e41 mode 100755,100644..100755 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py - 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit ed4e6c4e211354771f5f9f58f554723de95caf21 Merge: ba50ec9cd9 d173f57558 Author: Brandon Williams AuthorDate: Fri Aug 18 10:41:16 2023 -0500 Merge branch 'cassandra-3.11' into cassandra-4.0 .gitignore | 1 + 1 file changed, 1 insertion(+) diff --cc .gitignore index 318f2006db,bf4213f97f..72d8b93167 --- a/.gitignore +++ b/.gitignore @@@ -11,9 -10,9 +11,10 @@@ data conf/hotspot_compiler doc/cql3/CQL.html doc/build/ +lib/ pylib/src/ + pylib/cqlshlib/serverversion.py -lib/ +!lib/cassandra-driver-internal-only-*.zip # C* debs build-stamp - 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit ba50ec9cd9f82a65cb70d08fbb30a1f41428d98a
Merge: fb395c6b8b 1dd38998a0
Author: Brandon Williams
AuthorDate: Fri Aug 18 10:10:11 2023 -0500
Merge branch 'cassandra-3.11' into cassandra-4.0
.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 90f8f99dfe,7ee07ec953..a96137164e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,12 +1,26 @@@
-3.11.17
+4.0.12
+ * Fix NTS log message when an unrecognized strategy option is passed
(CASSANDRA-18679)
+ * Fix BulkLoader ignoring cipher suites options (CASSANDRA-18582)
+ * Migrate Python optparse to argparse (CASSANDRA-17914)
+Merged from 3.11:
+ * Moved jflex from runtime to build dependencies (CASSANDRA-18664)
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)
+ * Fix Requires for Java for RPM package (CASSANDRA-18751)
+ * Fix CQLSH online help topic link (CASSANDRA-17534)
+ * Remove unused suppressions (CASSANDRA-18724)
-3.11.16
- * Moved jflex from runtime to build dependencies (CASSANDRA-18664)
+4.0.11
+ * Revert CASSANDRA-16718 (CASSANDRA-18560)
+ * Upgrade snappy to 1.1.10.1 (CASSANDRA-18608)
+ * Fix assertion error when describing mv as table (CASSANDRA-18596)
+ * Track the amount of read data per row (CASSANDRA-18513)
+ * Fix Down nodes counter in nodetool describecluster (CASSANDRA-18512)
+ * Remove unnecessary shuffling of GossipDigests in
Gossiper#makeRandomGossipDigest (CASSANDRA-18546)
+Merged from 3.11:
* 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)
diff --cc bin/cqlsh.py
index 00bd00d134,a2f1a9e5ed..4ca4469604
mode 100755,100644..100755
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -511,11 -532,12 +512,13 @@@ class Shell(cmd.Cmd)
if stdin is None:
stdin = sys.stdin
+ self.check_build_versions()
+
if tty:
self.reset_prompt()
+self.maybe_warn_py2()
self.report_connection()
-print 'Use HELP for help.'
+print('Use HELP for help.')
else:
self.show_line_nums = True
self.stdin = stdin
diff --cc build.xml
index ec1aba8368,aa1fc02afc..0b914175bb
--- a/build.xml
+++ b/build.xml
@@@ -863,8 -660,42 +863,8 @@@
-
-
-
-
-
- Generating Thrift Java code from
${basedir}/interface/cassandra.thrift...
-
-
-
-
-
-
-
-
-
- Generating Thrift Python code from
${basedir}/interface/cassandra.thrift...
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit fb395c6b8b005d44342aba3ebe1ad5dc4d62e586
Merge: b1f9b08578 c870641475
Author: Brandon Williams
AuthorDate: Fri Aug 18 05:10:27 2023 -0500
Merge branch 'cassandra-3.11' into cassandra-4.0
CHANGES.txt | 1 +
.../org/apache/cassandra/tools/nodetool/stats/StatsTable.java | 1 +
.../apache/cassandra/tools/nodetool/stats/TableStatsHolder.java | 2 ++
.../apache/cassandra/tools/nodetool/stats/TableStatsPrinter.java | 1 +
.../cassandra/tools/nodetool/stats/TableStatsPrinterTest.java | 8
.../apache/cassandra/tools/nodetool/stats/TableStatsTestBase.java | 1 +
6 files changed, 14 insertions(+)
diff --cc CHANGES.txt
index 43ee80e863,b8f489b183..90f8f99dfe
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,10 +1,24 @@@
-3.11.17
+4.0.12
+ * Fix NTS log message when an unrecognized strategy option is passed
(CASSANDRA-18679)
+ * Fix BulkLoader ignoring cipher suites options (CASSANDRA-18582)
+ * Migrate Python optparse to argparse (CASSANDRA-17914)
+Merged from 3.11:
+ * Moved jflex from runtime to build dependencies (CASSANDRA-18664)
Merged from 3.0:
+ * Fix missing speculative retries in tablestats (CASSANDRA-18767)
+ * Fix Requires for Java for RPM package (CASSANDRA-18751)
+ * Fix CQLSH online help topic link (CASSANDRA-17534)
+ * Remove unused suppressions (CASSANDRA-18724)
-3.11.16
- * Moved jflex from runtime to build dependencies (CASSANDRA-18664)
+4.0.11
+ * Revert CASSANDRA-16718 (CASSANDRA-18560)
+ * Upgrade snappy to 1.1.10.1 (CASSANDRA-18608)
+ * Fix assertion error when describing mv as table (CASSANDRA-18596)
+ * Track the amount of read data per row (CASSANDRA-18513)
+ * Fix Down nodes counter in nodetool describecluster (CASSANDRA-18512)
+ * Remove unnecessary shuffling of GossipDigests in
Gossiper#makeRandomGossipDigest (CASSANDRA-18546)
+Merged from 3.11:
* 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)
diff --cc
src/java/org/apache/cassandra/tools/nodetool/stats/TableStatsHolder.java
index 3cd2570185,35b2481c1a..7128dda767
--- a/src/java/org/apache/cassandra/tools/nodetool/stats/TableStatsHolder.java
+++ b/src/java/org/apache/cassandra/tools/nodetool/stats/TableStatsHolder.java
@@@ -97,80 -116,7 +97,81 @@@ public class TableStatsHolder implement
return mpRet;
}
-private void initializeKeyspaces(NodeProbe probe, boolean humanReadable,
boolean ignore, List tableNames)
+/**
+ * @returns Map a nested HashMap of the sorted and
filtered table names and the HashMaps of their statistics.
+ */
+private Map convertSortedFilteredSubsetToMap()
+{
+HashMap mpRet = new HashMap<>();
+mpRet.put("total_number_of_tables", numberOfTables);
+List sortedFilteredTables = getSortedFilteredTables();
+for (StatsTable table : sortedFilteredTables)
+{
+String tableDisplayName = table.keyspaceName + "." +
table.tableName;
+Map mpTable = convertStatsTableToMap(table);
+mpRet.put(tableDisplayName, mpTable);
+}
+return mpRet;
+}
+
+private Map convertStatsTableToMap(StatsTable table)
+{
+Map mpTable = new HashMap<>();
+mpTable.put("sstable_count", table.sstableCount);
+mpTable.put("old_sstable_count", table.oldSSTableCount);
+mpTable.put("sstables_in_each_level", table.sstablesInEachLevel);
+mpTable.put("space_used_live", table.spaceUsedLive);
+mpTable.put("space_used_total", table.spaceUsedTotal);
+mpTable.put("space_used_by_snapshots_total",
table.spaceUsedBySnapshotsTotal);
+if (table.offHeapUsed)
+mpTable.put("off_heap_memory_used_total",
table.offHeapMemoryUsedTotal);
+mpTable.put("sstable_compression_ratio",
table.sstableCompressionRatio);
+mpTable.put("number_of_partitions_estimate",
table.numberOfPartitionsEstimate);
+mpTable.put("memtable_cell_count", table.memtableCellCount);
+mpTable.put("memtable_data_size", table.memtableDataSize);
+if (table.memtableOffHeapUsed)
+mpTable.put("memtable_off_heap_memory_used",
table.memtableOffHeapMemoryUsed);
+mpTable.put("memtable_switch_count", table.memtableSwitchCount);
++mpTable.put("speculative_retries", table.speculativeRetries);
+mpTable.put("local_read_count", table.localReadCount);
+mpTable.put("local_read_latency_ms", String.format("%01.3f",
table.localReadLatencyMs));
+mpTable.put("local_write_count", table.localWriteCount);
+
[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 7ec9b7cf4f9827d3feaa15b62932cbfa0480b938 Merge: 8b331ddb4d 60d04d6713 Author: Brandon Williams AuthorDate: Tue Aug 8 10:07:00 2023 -0500 Merge branch 'cassandra-3.11' into cassandra-4.0 .build/dependency-check-suppressions.xml | 37 CHANGES.txt | 1 + 2 files changed, 1 insertion(+), 37 deletions(-) diff --cc .build/dependency-check-suppressions.xml index ae7ff368a7,47d37c53db..b7ebb45e57 --- a/.build/dependency-check-suppressions.xml +++ b/.build/dependency-check-suppressions.xml @@@ -20,19 -20,18 +20,10 @@@ https://jeremylong.github.io/DependencyCheck/general/suppression.html --> https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd;> - - - ^pkg:maven/com\.datastax\.cassandra/cassandra\-driver\-core@.*$ - CVE-2018-8016 - CVE-2019-2684 - CVE-2020-13946 - CVE-2020-17516 - CVE-2021-44521 - - -^pkg:maven/org\.xerial\.snappy/snappy\-java@.*$ -CVE-2023-34453 -CVE-2023-34454 -CVE-2023-34455 - - - + ^pkg:maven/org\.yaml/snakeyaml@.*$ CVE-2023-2251 -CVE-2017-18640 CVE-2022-25857 CVE-2022-38749 CVE-2022-38750 @@@ -44,37 -43,14 +35,15 @@@ CVE-2021-4235 CVE-2017-18640 - - - ^pkg:maven/net\.openhft/chronicle\-wire@.*$ - cpe:/a:wire:wire - - - + + +^pkg:maven/com\.google\.guava/guava@.*$ +CVE-2020-8908 +CVE-2023-2976 + - - - ^pkg:maven/org\.apache\.commons.*$ - CVE-2021-37533 - - - ^pkg:maven/commons-io/.*$ - CVE-2021-37533 - - - ^pkg:maven/commons-cli/.*$ - CVE-2021-37533 - - - ^pkg:maven/commons-codec/.*$ - CVE-2021-37533 - + ^pkg:maven/io\.netty/netty\-all@.*$ -CVE-2019-16869 -CVE-2019-20444 -CVE-2019-20445 -CVE-2020-7238 CVE-2021-21290 CVE-2021-21295 CVE-2021-21409 @@@ -92,12 -95,8 +61,6 @@@ 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 a45b6dce5d,8ca47eb52d..62b70b072f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,20 -1,5 +1,21 @@@ -3.11.16 +4.0.12 + * Fix NTS log message when an unrecognized strategy option is passed (CASSANDRA-18679) + * Fix BulkLoader ignoring cipher suites options (CASSANDRA-18582) + * Migrate Python optparse to argparse (CASSANDRA-17914) +Merged from 3.11: * Moved jflex from runtime to build dependencies (CASSANDRA-18664) +Merged from 3.0: ++ * Remove unused suppressions (CASSANDRA-18724) + + +4.0.11 + * Revert CASSANDRA-16718 (CASSANDRA-18560) + * Upgrade snappy to 1.1.10.1 (CASSANDRA-18608) + * Fix assertion error when describing mv as table (CASSANDRA-18596) + * Track the amount of read data per row (CASSANDRA-18513) + * Fix Down nodes counter in nodetool describecluster (CASSANDRA-18512) + * Remove unnecessary shuffling of GossipDigests in Gossiper#makeRandomGossipDigest (CASSANDRA-18546) +Merged from 3.11: * 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) - 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 309e9b1295dd0ef2ff436fc41055e1f5a8e618a1 Merge: c10c7375c1 3f09baf1c2 Author: Brandon Williams AuthorDate: Fri Jul 7 10:45:19 2023 -0500 Merge branch 'cassandra-3.11' into cassandra-4.0 .build/build-owasp.xml | 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit c10c7375c15026651aa09589488d127070019bc0 Merge: 822589e382 5326a39a1c Author: Brandon Williams AuthorDate: Thu Jul 6 10:07:12 2023 -0500 Merge branch 'cassandra-3.11' into cassandra-4.0 .build/dependency-check-suppressions.xml | 1 + CHANGES.txt | 1 + 2 files changed, 2 insertions(+) diff --cc .build/dependency-check-suppressions.xml index 26e3305a85,bffab75a23..ae7ff368a7 --- a/.build/dependency-check-suppressions.xml +++ b/.build/dependency-check-suppressions.xml @@@ -72,19 -107,17 +72,20 @@@ ^pkg:maven/commons-codec/.*$ CVE-2021-37533 - - + -^pkg:maven/org\.apache\.thrift/libthrift@.*$ -CVE-2015-3254 -CVE-2016-5397 -CVE-2018-1320 -CVE-2018-11798 -CVE-2019-0205 +^pkg:maven/io\.netty/netty\-all@.*$ +CVE-2021-21290 +CVE-2021-21295 +CVE-2021-21409 +CVE-2021-37136 +CVE-2021-37137 +CVE-2021-43797 +CVE-2022-24823 +CVE-2022-41881 +CVE-2022-41915 ++CVE-2023-34462 - ^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-databind@.*$ diff --cc CHANGES.txt index d5b2c1fe0d,2c8a444f55..937dd869e9 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -10,7 -4,9 +10,8 @@@ Merged from 3.11 * 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 822589e382f907c16f9d38638b3d5946dfdedc5c Merge: 0c79b2857a d302b837b2 Author: Brandon Williams AuthorDate: Thu Jul 6 09:50:50 2023 -0500 Merge branch 'cassandra-3.11' into cassandra-4.0 .build/dependency-check-suppressions.xml | 6 ++ CHANGES.txt | 1 + 2 files changed, 7 insertions(+) diff --cc CHANGES.txt index 04c9f848c8,44ffd6e824..d5b2c1fe0d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,5 +1,11 @@@ -3.11.16 +4.0.11 + * Upgrade snappy to 1.1.10.1 (CASSANDRA-18608) + * Fix assertion error when describing mv as table (CASSANDRA-18596) + * Track the amount of read data per row (CASSANDRA-18513) + * Fix Down nodes counter in nodetool describecluster (CASSANDRA-18512) + * Remove unnecessary shuffling of GossipDigests in Gossiper#makeRandomGossipDigest (CASSANDRA-18546) +Merged from 3.11: + * 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 - 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 0c79b2857ac86e1e6fa40ddbff04a8bb5c603375 Merge: 0a53770ddc 00cf31882b Author: Brandon Williams AuthorDate: Wed Jul 5 10:07:47 2023 -0500 Merge branch 'cassandra-3.11' into cassandra-4.0 - 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 0621658acddd3fbd4f931be31c94cacebce88953 Merge: 04fd3747cf 293f14cf36 Author: Brandon Williams AuthorDate: Wed Jun 28 06:04:49 2023 -0500 Merge branch 'cassandra-3.11' into cassandra-4.0 .build/dependency-check-suppressions.xml | 6 +- CHANGES.txt | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) diff --cc .build/dependency-check-suppressions.xml index 28e8005440,e6fe535381..904837e69c --- a/.build/dependency-check-suppressions.xml +++ b/.build/dependency-check-suppressions.xml @@@ -90,11 -122,11 +90,7 @@@ ^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-databind@.*$ CVE-2022-42003 CVE-2022-42004 - - - - ^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-core.*$ - CVE-2022-45688 + CVE-2023-35116 - - -^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-databind@.*$ - diff --cc CHANGES.txt index a288e7268e,2b38760593..a5a8b0f537 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -8,8 -2,11 +8,9 @@@ Merged from 3.11 * 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) * 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit bc3700da056f50de15050e5c9e9f3e2043292e0c
Merge: 76d11fdf51 254991750c
Author: Brandon Williams
AuthorDate: Wed Jun 21 18:00:01 2023 -0500
Merge branch 'cassandra-3.11' into cassandra-4.0
CHANGES.txt | 1 +
1 file changed, 1 insertion(+)
diff --cc CHANGES.txt
index 71031ebc2e,f36257a8e1..1d76328e15
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -7,26 -2,11 +7,27 @@@ Merged from 3.11
* 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:
+ * 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)
+
+
+4.0.10
+ * Improve nodetool enable{audit,fullquery}log (CASSANDRA-18550)
+ * Report network cache info in nodetool (CASSANDRa-18400)
+ * Partial compaction can resurrect deleted data (CASSANDRA-18507)
+ * Allow internal address to change with reconnecting snitches
(CASSANDRA-16718)
+ * Fix quoting in toCqlString methods of UDTs and aggregates (CASSANDRA-17918)
+ * NPE when deserializing malformed collections from client (CASSANDRA-18505)
+ * Improve 'Not enough space for compaction' logging messages
(CASSANDRA-18260)
+ * Incremental repairs fail on mixed IPv4/v6 addresses serializing
SyncRequest (CASSANDRA-18474)
+ * Deadlock updating sstable metadata if disk boundaries need reloading
(CASSANDRA-18443)
+ * Fix nested selection of reversed collections (CASSANDRA-17913)
+Merged from 3.11:
+ * Remove unnecessary String.format invocation in QueryProcessor when getting
a prepared statement from cache (CASSANDRA-17202)
+ * Fix the capital P usage in the CQL parser (CASSANDRA-17919)
+Merged from 3.0:
* Pass down all contact points to driver for cassandra-stress
(CASSANDRA-18025)
* Validate the existence of a datacenter in nodetool rebuild
(CASSANDRA-14319)
* Suppress CVE-2023-2251 (CASSANDRA-18497)
-
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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 76d11fdf517c70abb88b5a78c90190f0f99ae820 Merge: 92d0a40c96 ece247b6ee Author: Brandon Williams AuthorDate: Wed Jun 21 06:26:43 2023 -0500 Merge branch 'cassandra-3.11' into cassandra-4.0 - 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 2fcdaa5b76b77106108579cad60226130492e37d
Merge: 5143bd81e8 1eccb2bc1f
Author: Brandon Williams
AuthorDate: Wed Jun 14 11:34:51 2023 -0500
Merge branch 'cassandra-3.11' into cassandra-4.0
CHANGES.txt| 1 +
.../statements/schema/CreateTableStatement.java| 10 +++-
.../schema/CreateTableValidationTest.java | 59 ++
3 files changed, 68 insertions(+), 2 deletions(-)
diff --cc CHANGES.txt
index e0ffe9061e,942651a37e..a7c17c7dcb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,7 +1,10 @@@
-3.11.16
+4.0.11
+ * Track the amount of read data per row (CASSANDRA-18513)
+ * Fix Down nodes counter in nodetool describecluster (CASSANDRA-18512)
+ * Remove unnecessary shuffling of GossipDigests in
Gossiper#makeRandomGossipDigest (CASSANDRA-18546)
+Merged from 3.11:
+ * 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-2976 (CASSANDRA-18562)
* Remove dh_python use in Debian packaging (CASSANDRA-18558)
diff --cc
src/java/org/apache/cassandra/cql3/statements/schema/CreateTableStatement.java
index 1339ba39f7,00..78b9d6e52e
mode 100644,00..100644
---
a/src/java/org/apache/cassandra/cql3/statements/schema/CreateTableStatement.java
+++
b/src/java/org/apache/cassandra/cql3/statements/schema/CreateTableStatement.java
@@@ -1,529 -1,0 +1,535 @@@
+/*
+ * 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.cql3.statements.schema;
+
+import java.util.*;
++import java.util.stream.Collectors;
+
+import com.google.common.collect.ImmutableSet;
+
+import org.apache.commons.lang3.StringUtils;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.cassandra.audit.AuditLogContext;
+import org.apache.cassandra.audit.AuditLogEntryType;
+import org.apache.cassandra.auth.DataResource;
+import org.apache.cassandra.auth.IResource;
+import org.apache.cassandra.auth.Permission;
+import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.cql3.*;
+import org.apache.cassandra.db.marshal.*;
+import org.apache.cassandra.exceptions.AlreadyExistsException;
+import org.apache.cassandra.schema.*;
+import org.apache.cassandra.schema.Keyspaces.KeyspacesDiff;
+import org.apache.cassandra.service.ClientState;
+import org.apache.cassandra.service.reads.repair.ReadRepairStrategy;
+import org.apache.cassandra.transport.Event.SchemaChange;
+import org.apache.cassandra.transport.Event.SchemaChange.Change;
+import org.apache.cassandra.transport.Event.SchemaChange.Target;
+
+import static java.util.Comparator.comparing;
+
+import static com.google.common.collect.Iterables.concat;
+
+public final class CreateTableStatement extends AlterSchemaStatement
+{
+private static final Logger logger =
LoggerFactory.getLogger(CreateTableStatement.class);
+private final String tableName;
+
+private final Map rawColumns;
+private final Set staticColumns;
+private final List partitionKeyColumns;
+private final List clusteringColumns;
+
+private final LinkedHashMap clusteringOrder;
+private final TableAttributes attrs;
+
+private final boolean ifNotExists;
+private final boolean useCompactStorage;
+
+public CreateTableStatement(String keyspaceName,
+String tableName,
+
+Map
rawColumns,
+Set staticColumns,
+List partitionKeyColumns,
+List clusteringColumns,
+
+LinkedHashMap
clusteringOrder,
+
[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit c94eb0e37b4e9d64303d7a8b7beca24270e39c05 Merge: 2393bb16f3 7de3e61d75 Author: Bereng AuthorDate: Mon Jun 12 10:01:25 2023 +0200 Merge branch 'cassandra-3.11' into cassandra-4.0 * cassandra-3.11: Generate.sh -s param to skip autodetection of tests .circleci/generate.sh | 12 +--- .circleci/readme.md | 3 +++ 2 files changed, 12 insertions(+), 3 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 2393bb16f308d4d51335a97851646973aceb8066 Merge: f368b9dc1e 3855c8a194 Author: Andrés de la Peña AuthorDate: Wed Jun 7 11:04:52 2023 +0100 Merge branch 'cassandra-3.11' into cassandra-4.0 .circleci/generate.sh | 19 --- 1 file changed, 16 insertions(+), 3 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit be8cd8ab6bcdc066ed08c3a4371984f10c6fa322
Merge: fb41fb46fc 9c970cc117
Author: Brandon Williams
AuthorDate: Mon Jun 5 05:58:40 2023 -0500
Merge branch 'cassandra-3.11' into cassandra-4.0
.build/dependency-check-suppressions.xml | 1 +
CHANGES.txt | 2 ++
2 files changed, 3 insertions(+)
diff --cc .build/dependency-check-suppressions.xml
index f8aa4b5fb7,27bef03dd2..28e8005440
--- a/.build/dependency-check-suppressions.xml
+++ b/.build/dependency-check-suppressions.xml
@@@ -44,16 -36,52 +44,17 @@@
CVE-2021-4235
CVE-2017-18640
-
-
-
-^pkg:maven/io\.netty/netty\-all@.*$
-CVE-2019-16869
-CVE-2019-20444
-CVE-2019-20445
-CVE-2020-7238
-CVE-2021-21290
-CVE-2021-21295
-CVE-2021-21409
-CVE-2021-37136
-CVE-2021-37137
-CVE-2021-43797
-CVE-2022-24823
-CVE-2022-41881
-CVE-2022-41915
-
-
-
-
-^pkg:maven/ch\.qos\.logback/logback\-core@.*$
-CVE-2017-5929
-
-
-^pkg:maven/ch\.qos\.logback/logback\-classic@.*$
-CVE-2017-5929
-
-
-
-^pkg:maven/com\.datastax\.cassandra/cassandra\-driver\-core@.*$
-CVE-2019-2684
-CVE-2020-13946
-CVE-2020-17516
-CVE-2021-44521
+
+^pkg:maven/net\.openhft/chronicle\-wire@.*$
+cpe:/a:wire:wire
-
-
+
^pkg:maven/com\.google\.guava/guava@.*$
-CVE-2018-10237
CVE-2020-8908
+ CVE-2023-2976
-
^pkg:maven/org\.apache\.commons.*$
diff --cc CHANGES.txt
index 6a6b9d8b00,d86b27595f..8e02cee7f2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,9 +1,26 @@@
-3.11.16
- * Remove unnecessary String.format invocation in QueryProcessor when getting
a prepared statement from cache (CASSANDRA-17202)
+4.0.11
+ * Remove unnecessary shuffling of GossipDigests in
Gossiper#makeRandomGossipDigest (CASSANDRA-18546)
+Merged from 3.11:
Merged from 3.0:
+ 3.0.30
+ * Suppress CVE-2023-2976 (CASSANDRA-18562)
* Remove dh_python use in Debian packaging (CASSANDRA-18558)
+
+4.0.10
+ * Improve nodetool enable{audit,fullquery}log (CASSANDRA-18550)
+ * Report network cache info in nodetool (CASSANDRa-18400)
+ * Partial compaction can resurrect deleted data (CASSANDRA-18507)
+ * Allow internal address to change with reconnecting snitches
(CASSANDRA-16718)
+ * Fix quoting in toCqlString methods of UDTs and aggregates (CASSANDRA-17918)
+ * NPE when deserializing malformed collections from client (CASSANDRA-18505)
+ * Improve 'Not enough space for compaction' logging messages
(CASSANDRA-18260)
+ * Incremental repairs fail on mixed IPv4/v6 addresses serializing
SyncRequest (CASSANDRA-18474)
+ * Deadlock updating sstable metadata if disk boundaries need reloading
(CASSANDRA-18443)
+ * Fix nested selection of reversed collections (CASSANDRA-17913)
+Merged from 3.11:
+ * Remove unnecessary String.format invocation in QueryProcessor when getting
a prepared statement from cache (CASSANDRA-17202)
+ * Fix the capital P usage in the CQL parser (CASSANDRA-17919)
+Merged from 3.0:
* Pass down all contact points to driver for cassandra-stress
(CASSANDRA-18025)
* Validate the existence of a datacenter in nodetool rebuild
(CASSANDRA-14319)
* Suppress CVE-2023-2251 (CASSANDRA-18497)
-
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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit fb41fb46fcbc65f42cef23f6d1be33b1eca317c0 Merge: eb6a45fe6d 572db17350 Author: Brandon Williams AuthorDate: Thu Jun 1 15:30:04 2023 -0500 Merge branch 'cassandra-3.11' into cassandra-4.0 - 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit eb6a45fe6d34f9dd35462eec6eba3e5904562f96
Merge: 57293e8281 1923e6955a
Author: Brandon Williams
AuthorDate: Thu Jun 1 15:02:22 2023 -0500
Merge branch 'cassandra-3.11' into cassandra-4.0
CHANGES.txt | 1 +
debian/rules | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --cc CHANGES.txt
index 786a8a6c92,0aed2d9f62..6a6b9d8b00
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,7 +1,24 @@@
-3.11.16
- * Remove unnecessary String.format invocation in QueryProcessor when getting
a prepared statement from cache (CASSANDRA-17202)
+4.0.11
+ * Remove unnecessary shuffling of GossipDigests in
Gossiper#makeRandomGossipDigest (CASSANDRA-18546)
+Merged from 3.11:
Merged from 3.0:
+ * Remove dh_python use in Debian packaging (CASSANDRA-18558)
+
+4.0.10
+ * Improve nodetool enable{audit,fullquery}log (CASSANDRA-18550)
+ * Report network cache info in nodetool (CASSANDRa-18400)
+ * Partial compaction can resurrect deleted data (CASSANDRA-18507)
+ * Allow internal address to change with reconnecting snitches
(CASSANDRA-16718)
+ * Fix quoting in toCqlString methods of UDTs and aggregates (CASSANDRA-17918)
+ * NPE when deserializing malformed collections from client (CASSANDRA-18505)
+ * Improve 'Not enough space for compaction' logging messages
(CASSANDRA-18260)
+ * Incremental repairs fail on mixed IPv4/v6 addresses serializing
SyncRequest (CASSANDRA-18474)
+ * Deadlock updating sstable metadata if disk boundaries need reloading
(CASSANDRA-18443)
+ * Fix nested selection of reversed collections (CASSANDRA-17913)
+Merged from 3.11:
+ * Remove unnecessary String.format invocation in QueryProcessor when getting
a prepared statement from cache (CASSANDRA-17202)
+ * Fix the capital P usage in the CQL parser (CASSANDRA-17919)
+Merged from 3.0:
* Pass down all contact points to driver for cassandra-stress
(CASSANDRA-18025)
* Validate the existence of a datacenter in nodetool rebuild
(CASSANDRA-14319)
* Suppress CVE-2023-2251 (CASSANDRA-18497)
-
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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 2d40ee90194c881ec1032f527d4e8b76d8c0c80a Merge: 75194201f1 b11021ee68 Author: Brandon Williams AuthorDate: Mon May 15 11:22:19 2023 -0500 Merge branch 'cassandra-3.11' into cassandra-4.0 - 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit f7de633ff84589657166cb73f7aff7906b5f5b0e Merge: 682ae0c64c ee5b601ce7 Author: Brandon Williams AuthorDate: Fri May 5 06:09:35 2023 -0500 Merge branch 'cassandra-3.11' into cassandra-4.0 - 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 1929550fc07ff938a7ddce36e55df16e46501801 Merge: b183e1f0de 90d0857d34 Author: Mick Semb Wever AuthorDate: Sat Apr 29 18:24:24 2023 +0200 Merge branch 'cassandra-3.11' into cassandra-4.0 doc/modules/cassandra/pages/data_modeling/data_modeling_queries.adoc | 2 +- doc/modules/cassandra/pages/data_modeling/data_modeling_rdbms.adoc | 2 +- doc/modules/cassandra/pages/getting_started/production.adoc | 2 +- 3 files changed, 3 insertions(+), 3 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository.
adelapena pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 3f67827387cd2fa790c5587d17105fcadeda451c
Merge: 2fce3025c4 08b9471a1e
Author: Andrés de la Peña
AuthorDate: Mon Apr 17 14:48:27 2023 +0100
Merge branch 'cassandra-3.11' into cassandra-4.0
CHANGES.txt| 1 +
.../tools/nodetool/stats/TableStatsHolder.java | 2 +
.../nodetool/stats/NodetoolTableStatsTest.java | 31 +
.../nodetool/stats/TableStatsPrinterTest.java | 129 -
4 files changed, 161 insertions(+), 2 deletions(-)
diff --cc CHANGES.txt
index 084aa07679,7b55089f5d..cf208d7eb9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,5 +1,16 @@@
-3.11.15
+4.0.10
+ * Fix nested selection of reversed collections (CASSANDRA-17913)
+
+4.0.9
+ * Update zstd-jni library to version 1.5.5 (CASSANDRA-18429)
+ * Backport CASSANDRA-17205 to 4.0 branch - Remove self-reference in
SSTableTidier (CASSANDRA-18332)
+ * Avoid loading the preferred IP for BulkLoader streaming (CASSANDRA-18370)
+ * Fix BufferPool incorrect memoryInUse when putUnusedPortion is used
(CASSANDRA-18311)
+ * Improve memtable allocator accounting when updating AtomicBTreePartition
(CASSANDRA-18125)
+ * Update zstd-jni to version 1.5.4-1 (CASSANDRA-18259)
+ * Split and order IDEA workspace template VM_PARAMETERS (CASSANDRA-18242)
+Merged from 3.11:
+ * 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:
diff --cc
src/java/org/apache/cassandra/tools/nodetool/stats/TableStatsHolder.java
index a5877384b6,300895f288..3cd2570185
--- a/src/java/org/apache/cassandra/tools/nodetool/stats/TableStatsHolder.java
+++ b/src/java/org/apache/cassandra/tools/nodetool/stats/TableStatsHolder.java
@@@ -97,78 -115,7 +97,80 @@@ public class TableStatsHolder implement
return mpRet;
}
-private void initializeKeyspaces(NodeProbe probe, boolean humanReadable,
boolean ignore, List tableNames)
+/**
+ * @returns Map a nested HashMap of the sorted and
filtered table names and the HashMaps of their statistics.
+ */
+private Map convertSortedFilteredSubsetToMap()
+{
+HashMap mpRet = new HashMap<>();
+mpRet.put("total_number_of_tables", numberOfTables);
+List sortedFilteredTables = getSortedFilteredTables();
+for (StatsTable table : sortedFilteredTables)
+{
+String tableDisplayName = table.keyspaceName + "." +
table.tableName;
+Map mpTable = convertStatsTableToMap(table);
+mpRet.put(tableDisplayName, mpTable);
+}
+return mpRet;
+}
+
+private Map convertStatsTableToMap(StatsTable table)
+{
+Map mpTable = new HashMap<>();
++mpTable.put("sstable_count", table.sstableCount);
++mpTable.put("old_sstable_count", table.oldSSTableCount);
+mpTable.put("sstables_in_each_level", table.sstablesInEachLevel);
+mpTable.put("space_used_live", table.spaceUsedLive);
+mpTable.put("space_used_total", table.spaceUsedTotal);
+mpTable.put("space_used_by_snapshots_total",
table.spaceUsedBySnapshotsTotal);
+if (table.offHeapUsed)
+mpTable.put("off_heap_memory_used_total",
table.offHeapMemoryUsedTotal);
+mpTable.put("sstable_compression_ratio",
table.sstableCompressionRatio);
+mpTable.put("number_of_partitions_estimate",
table.numberOfPartitionsEstimate);
+mpTable.put("memtable_cell_count", table.memtableCellCount);
+mpTable.put("memtable_data_size", table.memtableDataSize);
+if (table.memtableOffHeapUsed)
+mpTable.put("memtable_off_heap_memory_used",
table.memtableOffHeapMemoryUsed);
+mpTable.put("memtable_switch_count", table.memtableSwitchCount);
+mpTable.put("local_read_count", table.localReadCount);
+mpTable.put("local_read_latency_ms", String.format("%01.3f",
table.localReadLatencyMs));
+mpTable.put("local_write_count", table.localWriteCount);
+mpTable.put("local_write_latency_ms", String.format("%01.3f",
table.localWriteLatencyMs));
+mpTable.put("pending_flushes", table.pendingFlushes);
+mpTable.put("percent_repaired", table.percentRepaired);
+mpTable.put("bytes_repaired", table.bytesRepaired);
+mpTable.put("bytes_unrepaired", table.bytesUnrepaired);
+mpTable.put("bytes_pending_repair", table.bytesPendingRepair);
+mpTable.put("bloom_filter_false_positives",
table.bloomFilterFalsePositives);
+mpTable.put("bloom_filter_false_ratio", String.format("%01.5f",
table.bloomFilterFalseRatio));
+
[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository.
adelapena pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 2aedb58123e562ef6bdb7314033512d0128329ea
Merge: a874e02eec 4b3cb0a772
Author: Andrés de la Peña
AuthorDate: Fri Mar 10 11:51:25 2023 +
Merge branch 'cassandra-3.11' into cassandra-4.0
.circleci/config-2_1.yml.high_res.patch| 155 -
.circleci/{config.yml.LOWRES => config.yml.FREE} | 0
.circleci/config.yml.HIGHRES | 11630 ---
.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(+), 11897 deletions(-)
diff --cc .circleci/readme.md
index 093e8cbcf3,7391ed11cf..67b00e6eca
--- a/.circleci/readme.md
+++ b/.circleci/readme.md
@@@ -69,9 -74,8 +74,9 @@@ The script will then create jobs to ru
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_FQLTOOL_COUNT=500 \
-e REPEATED_UTESTS_LONG_COUNT=100 \
-e REPEATED_UTESTS_STRESS_COUNT=500 \
-e REPEATED_SIMULATOR_DTESTS_COUNT=500 \
@@@ -89,9 -93,8 +94,9 @@@ 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_FQLTOOL=org.apache.cassandra.fqltool.FQLCompareTest \
-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
\
-
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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit a874e02eecb282287929db6dfe76f1694c87a217
Merge: 40f9ca60f1 326b5aceb1
Author: Brandon Williams
AuthorDate: Thu Mar 9 10:02:33 2023 -0600
Merge branch 'cassandra-3.11' into cassandra-4.0
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 | 5 +
6 files changed, 321 insertions(+), 15 deletions(-)
diff --cc CHANGES.txt
index f2064c098e,2812ae77d1..3aadd0c78c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,31 -1,7 +1,32 @@@
-3.11.15
- * Fix Splitter sometimes creating more splits than requested
(CASSANDRA-18013)
+4.0.9
+ * Improve memtable allocator accounting when updating AtomicBTreePartition
(CASSANDRA-18125)
+ * Update zstd-jni to version 1.5.4-1 (CASSANDRA-18259)
+ * Split and order IDEA workspace template VM_PARAMETERS (CASSANDRA-18242)
+Merged from 3.11:
Merged from 3.0:
+ * Fix default file system error handler for disk_failure_policy die
(CASSANDRA-18294)
+
+4.0.8
+ * Log warning message on aggregation queries without key or on multiple keys
(CASSANDRA-18219)
+ * Fix the output of FQL dump tool to properly separate entries
(CASSANDRA-18215)
+ * Add cache type information for maximum memory usage warning message
(CASSANDRA-18184)
+ * Fix NPE in fqltool dump on null value (CASSANDRA-18113)
+ * Improve unit tests performance (CASSANDRA-17427)
+ * Connect to listen address when own broadcast address is requested
(CASSANDRA-18200)
+ * Add safeguard so cleanup fails when node has pending ranges
(CASSANDRA-16418)
+ * Fix legacy clustering serialization for paging with compact storage
(CASSANDRA-17507)
+ * Add support for python 3.11 (CASSANDRA-18088)
+ * Fix formatting of duration in cqlsh (CASSANDRA-18141)
+ * Fix sstable loading of keyspaces named snapshots or backups
(CASSANDRA-14013)
+ * Avoid ConcurrentModificationException in STCS/DTCS/TWCS.getSSTables
(CASSANDRA-17977)
+ * Restore internode custom tracing on 4.0's new messaging system
(CASSANDRA-17981)
+ * Harden parsing of boolean values in CQL in PropertyDefinitions
(CASSANDRA-17878)
+ * Fix error message about type hints (CASSANDRA-17915)
+ * Fix possible race condition on repair snapshots (CASSANDRA-17955)
+ * Fix ASM bytecode version inconsistency (CASSANDRA-17873)
+Merged from 3.11:
+ * Fix Splitter sometimes creating more splits than requested
(CASSANDRA-18013)
+Merged from 3.0:
* 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 c7abfc5571,efe05ca1a6..f8b9f010c8
---
a/test/distributed/org/apache/cassandra/distributed/test/JVMStabilityInspectorThrowableTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/test/JVMStabilityInspectorThrowableTest.java
@@@ -181,26 -212,35 +212,37 @@@ 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;
}
-public UnfilteredRowIterator iterator(DecoratedKey key, Slices
slices, ColumnFilter selectedColumns, boolean reversed, boolean isForThrift,
SSTableReadsListener listener)
+@Override
+public UnfilteredRowIterator iterator(DecoratedKey key, Slices
slices, ColumnFilter selectedColumns, boolean reversed, SSTableReadsListener
listener)
{
- throw throwCorrupted();
+ if (shouldThrowCorrupted)
+ throw throwCorrupted();
+ throw throwFSError();
}
-public UnfilteredRowIterator iterator(FileDataInput file,
DecoratedKey key, RowIndexEntry indexEntry, Slices slices, ColumnFilter
selectedColumns, boolean reversed, boolean isForThrift)
+@Override
+public UnfilteredRowIterator iterator(FileDataInput file,
DecoratedKey key, RowIndexEntry indexEntry, Slices slices, ColumnFilter
selectedColumns, boolean reversed)
{
- throw throwCorrupted();
+ if (shouldThrowCorrupted)
+ throw throwCorrupted();
+
[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit ccede05bf5fbf3d8e409960d6c93845f47ee6339 Merge: 1d532bce7b 4b84a8d7ac Author: Brandon Williams AuthorDate: Fri Feb 24 12:32:18 2023 -0600 Merge branch 'cassandra-3.11' into cassandra-4.0 .build/dependency-check-suppressions.xml | 4 ++-- 1 file 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 1d532bce7bb4cee8073a15a5b7572fc4d9ad8bcd
Merge: 3a4fff38b5 a5b05cea5e
Author: Brandon Williams
AuthorDate: Wed Feb 22 10:25:08 2023 -0600
Merge branch 'cassandra-3.11' into cassandra-4.0
NOTICE.txt | 2 +-
build.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --cc build.xml
index e29a00363f,79b28c..979b116ee7
--- a/build.xml
+++ b/build.xml
@@@ -306,18 -188,11 +306,18 @@@
+useexternalfile="yes" encoding="UTF-8" failonerror="false"
+maxmemory="256m" additionalparam="${jdk11-javadoc-exports}">
+
+
+
+
+
+
+
-
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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit ef2066fe6084e424ae7dd57f669d06b86a3924a1 Merge: f8ad33ed4e 74b0b2086f Author: Brandon Williams AuthorDate: Mon Jan 30 15:49:20 2023 -0600 Merge branch 'cassandra-3.11' into cassandra-4.0 doc/scripts/gen-nodetool-docs.py | 4 +++- 1 file changed, 3 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit c2e9e0d8416866d6600444773f11f592711a5fe9 Merge: 299ead7534 03c86cfcb0 Author: Brandon Williams AuthorDate: Wed Jan 25 15:16:32 2023 -0600 Merge branch 'cassandra-3.11' into cassandra-4.0 doc/scripts/gen-nodetool-docs.py | 26 +++--- 1 file changed, 23 insertions(+), 3 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 299ead7534a97af44035ab90002565f88f439144 Merge: 5f54d64c78 e9aa5ec514 Author: Brandon Williams AuthorDate: Tue Jan 24 12:26:12 2023 -0600 Merge branch 'cassandra-3.11' into cassandra-4.0 .build/dependency-check-suppressions.xml | 4 CHANGES.txt | 1 + 2 files changed, 5 insertions(+) diff --cc .build/dependency-check-suppressions.xml index 35d9bd096f,8c5cf0f592..3c81e79c17 --- a/.build/dependency-check-suppressions.xml +++ b/.build/dependency-check-suppressions.xml @@@ -38,17 -30,55 +38,21 @@@ CVE-2022-38751 CVE-2022-38752 CVE-2022-41854 + CVE-2021-1471 + CVE-2021-3064 + CVE-2021-4235 + CVE-2017-18640 - - - -^pkg:maven/io\.netty/netty\-all@.*$ -CVE-2019-16869 -CVE-2019-20444 -CVE-2019-20445 -CVE-2020-7238 -CVE-2021-21290 -CVE-2021-21295 -CVE-2021-21409 -CVE-2021-37136 -CVE-2021-37137 -CVE-2021-43797 -CVE-2022-24823 -CVE-2022-41881 - - - - -^pkg:maven/ch\.qos\.logback/logback\-core@.*$ -CVE-2017-5929 - -^pkg:maven/ch\.qos\.logback/logback\-classic@.*$ -CVE-2017-5929 + +^pkg:maven/net\.openhft/chronicle\-wire@.*$ +cpe:/a:wire:wire - - - -^pkg:maven/com\.datastax\.cassandra/cassandra\-driver\-core@.*$ -CVE-2019-2684 -CVE-2020-13946 -CVE-2020-17516 -CVE-2021-44521 - - - + ^pkg:maven/com\.google\.guava/guava@.*$ -CVE-2018-10237 CVE-2020-8908 - ^pkg:maven/org\.apache\.commons.*$ diff --cc CHANGES.txt index 0c0b1801c6,5a59323aa0..025f710a4a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,18 -1,7 +1,19 @@@ -3.11.15 +4.0.8 + * Add safeguard so cleanup fails when node has pending ranges (CASSANDRA-16418) + * Fix legacy clustering serialization for paging with compact storage (CASSANDRA-17507) + * Add support for python 3.11 (CASSANDRA-18088) + * Fix formatting of duration in cqlsh (CASSANDRA-18141) + * Fix sstable loading of keyspaces named snapshots or backups (CASSANDRA-14013) + * Avoid ConcurrentModificationException in STCS/DTCS/TWCS.getSSTables (CASSANDRA-17977) + * Restore internode custom tracing on 4.0's new messaging system (CASSANDRA-17981) + * Harden parsing of boolean values in CQL in PropertyDefinitions (CASSANDRA-17878) + * Fix error message about type hints (CASSANDRA-17915) + * Fix possible race condition on repair snapshots (CASSANDRA-17955) + * Fix ASM bytecode version inconsistency (CASSANDRA-17873) +Merged from 3.11: * 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 5f54d64c78818125f47ecc509a757f4b55fcc893
Merge: 8bb9c72f58 92245b0f07
Author: Brandon Williams
AuthorDate: Tue Jan 24 06:31:50 2023 -0600
Merge branch 'cassandra-3.11' into cassandra-4.0
CHANGES.txt | 1 +
src/java/org/apache/cassandra/config/YamlConfigurationLoader.java | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --cc CHANGES.txt
index 789d8f7fa8,fd15a7f770..0c0b1801c6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,7 +1,19 @@@
-3.11.15
+4.0.8
+ * Add safeguard so cleanup fails when node has pending ranges
(CASSANDRA-16418)
+ * Fix legacy clustering serialization for paging with compact storage
(CASSANDRA-17507)
+ * Add support for python 3.11 (CASSANDRA-18088)
+ * Fix formatting of duration in cqlsh (CASSANDRA-18141)
+ * Fix sstable loading of keyspaces named snapshots or backups
(CASSANDRA-14013)
+ * Avoid ConcurrentModificationException in STCS/DTCS/TWCS.getSSTables
(CASSANDRA-17977)
+ * Restore internode custom tracing on 4.0's new messaging system
(CASSANDRA-17981)
+ * Harden parsing of boolean values in CQL in PropertyDefinitions
(CASSANDRA-17878)
+ * Fix error message about type hints (CASSANDRA-17915)
+ * Fix possible race condition on repair snapshots (CASSANDRA-17955)
+ * Fix ASM bytecode version inconsistency (CASSANDRA-17873)
+Merged from 3.11:
* 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 a8d4695cb0,e55ec85109..48af78bb1f
--- a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
+++ b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
@@@ -126,9 -122,8 +126,9 @@@ public class YamlConfigurationLoader im
}
- Constructor constructor = new CustomConstructor(Config.class,
Yaml.class.getClassLoader());
+ SafeConstructor constructor = new CustomConstructor(Config.class,
Yaml.class.getClassLoader());
-PropertiesChecker propertiesChecker = new PropertiesChecker();
+Map, Map> replacements =
getNameReplacements(Config.class);
+PropertiesChecker propertiesChecker = new
PropertiesChecker(replacements);
constructor.setPropertyUtils(propertiesChecker);
Yaml yaml = new Yaml(constructor);
Config result = loadConfig(yaml, configBytes);
@@@ -151,9 -145,8 +151,9 @@@
@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.PropertiesChecker propertiesChecker = new
YamlConfigurationLoader.PropertiesChecker();
+Map, Map> replacements =
getNameReplacements(Config.class);
+YamlConfigurationLoader.PropertiesChecker propertiesChecker = new
YamlConfigurationLoader.PropertiesChecker(replacements);
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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 7377e16121057cc736dfee5449b5ad2fef9756f3 Merge: 9a0af4112e 6f719f811a Author: Brandon Williams AuthorDate: Mon Jan 23 06:56:00 2023 -0600 Merge branch 'cassandra-3.11' into cassandra-4.0 .build/dependency-check-suppressions.xml | 1 + CHANGES.txt | 1 + 2 files changed, 2 insertions(+) diff --cc .build/dependency-check-suppressions.xml index 71d4672bc3,45b8e41835..35d9bd096f --- a/.build/dependency-check-suppressions.xml +++ b/.build/dependency-check-suppressions.xml @@@ -66,17 -92,17 +66,18 @@@ ^pkg:maven/commons-codec/.*$ CVE-2021-37533 - - + -^pkg:maven/org\.apache\.thrift/libthrift@.*$ -CVE-2015-3254 -CVE-2016-5397 -CVE-2018-1320 -CVE-2018-11798 -CVE-2019-0205 +^pkg:maven/io\.netty/netty\-all@.*$ +CVE-2021-21290 +CVE-2021-21295 +CVE-2021-21409 +CVE-2021-37136 +CVE-2021-37137 +CVE-2021-43797 +CVE-2022-24823 ++CVE-2022-41881 - ^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-databind@.*$ diff --cc CHANGES.txt index f032fc390e,314734a50e..baae04c3de --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,7 +1,18 @@@ -3.11.15 +4.0.8 + * Fix legacy clustering serialization for paging with compact storage (CASSANDRA-17507) + * Add support for python 3.11 (CASSANDRA-18088) + * Fix formatting of duration in cqlsh (CASSANDRA-18141) + * Fix sstable loading of keyspaces named snapshots or backups (CASSANDRA-14013) + * Avoid ConcurrentModificationException in STCS/DTCS/TWCS.getSSTables (CASSANDRA-17977) + * Restore internode custom tracing on 4.0's new messaging system (CASSANDRA-17981) + * Harden parsing of boolean values in CQL in PropertyDefinitions (CASSANDRA-17878) + * Fix error message about type hints (CASSANDRA-17915) + * Fix possible race condition on repair snapshots (CASSANDRA-17955) + * Fix ASM bytecode version inconsistency (CASSANDRA-17873) +Merged from 3.11: * 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit ac8ddfb321551b8ffa75f75e5578713f9b083030 Merge: 6e6846892a d32c52aba7 Author: Brandon Williams AuthorDate: Tue Jan 17 09:57:51 2023 -0600 Merge branch 'cassandra-3.11' into cassandra-4.0 .build/dependency-check-suppressions.xml | 17 + CHANGES.txt | 1 + 2 files changed, 18 insertions(+) diff --cc .build/dependency-check-suppressions.xml index 481d8d0b3f,47639e5813..71d4672bc3 --- a/.build/dependency-check-suppressions.xml +++ b/.build/dependency-check-suppressions.xml @@@ -39,27 -31,77 +39,44 @@@ CVE-2022-38752 CVE-2022-41854 - - -^pkg:maven/io\.netty/netty\-all@.*$ -CVE-2019-16869 -CVE-2019-20444 -CVE-2019-20445 -CVE-2020-7238 -CVE-2021-21290 -CVE-2021-21295 -CVE-2021-21409 -CVE-2021-37136 -CVE-2021-37137 -CVE-2021-43797 -CVE-2022-24823 - - - - -^pkg:maven/ch\.qos\.logback/logback\-core@.*$ -CVE-2017-5929 + +^pkg:maven/net\.openhft/chronicle\-wire@.*$ +cpe:/a:wire:wire -^pkg:maven/ch\.qos\.logback/logback\-classic@.*$ -CVE-2017-5929 - - - - -^pkg:maven/com\.datastax\.cassandra/cassandra\-driver\-core@.*$ -CVE-2019-2684 -CVE-2020-13946 -CVE-2020-17516 -CVE-2021-44521 - - - - + ^pkg:maven/com\.google\.guava/guava@.*$ -CVE-2018-10237 CVE-2020-8908 - + + + ^pkg:maven/org\.apache\.commons.*$ + CVE-2021-37533 + + + ^pkg:maven/commons-io/.*$ + CVE-2021-37533 + + + ^pkg:maven/commons-cli/.*$ + CVE-2021-37533 + + + ^pkg:maven/commons-codec/.*$ + CVE-2021-37533 + - - + -^pkg:maven/org\.apache\.thrift/libthrift@.*$ -CVE-2015-3254 -CVE-2016-5397 -CVE-2018-1320 -CVE-2018-11798 -CVE-2019-0205 +^pkg:maven/io\.netty/netty\-all@.*$ +CVE-2021-21290 +CVE-2021-21295 +CVE-2021-21409 +CVE-2021-37136 +CVE-2021-37137 +CVE-2021-43797 +CVE-2022-24823 - ^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-databind@.*$ diff --cc CHANGES.txt index f57005204a,5b96779807..0f2d9e9812 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -1,7 +1,15 @@@ -3.11.15 +4.0.8 + * Fix sstable loading of keyspaces named snapshots or backups (CASSANDRA-14013) + * Avoid ConcurrentModificationException in STCS/DTCS/TWCS.getSSTables (CASSANDRA-17977) + * Restore internode custom tracing on 4.0's new messaging system (CASSANDRA-17981) + * Harden parsing of boolean values in CQL in PropertyDefinitions (CASSANDRA-17878) + * Fix error message about type hints (CASSANDRA-17915) + * Fix possible race condition on repair snapshots (CASSANDRA-17955) + * Fix ASM bytecode version inconsistency (CASSANDRA-17873) +Merged from 3.11: * 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 2c03055715c874846a2970ec6ec13c2dcf8cdf8c Merge: a83de9bcd2 de8daabab6 Author: Bereng AuthorDate: Mon Jan 16 07:07:05 2023 +0100 Merge branch 'cassandra-3.11' into cassandra-4.0 .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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository.
bereng pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit a83de9bcd21a032c1dbc6dc323c7e53f828b2cb6
Merge: 6c65c9e49e b8a87abba4
Author: Bereng
AuthorDate: Thu Jan 12 08:17:48 2023 +0100
Merge branch 'cassandra-3.11' into cassandra-4.0
src/java/org/apache/cassandra/db/Memtable.java | 20 +++-
.../cassandra/db/SinglePartitionReadCommand.java | 3 ++-
.../db/compaction/CompactionController.java | 16 +++-
.../apache/cassandra/db/ColumnFamilyStoreTest.java | 9 +
4 files changed, 41 insertions(+), 7 deletions(-)
diff --cc src/java/org/apache/cassandra/db/Memtable.java
index 73f45f7b96,9cfcb2f830..c6eb68ea57
--- a/src/java/org/apache/cassandra/db/Memtable.java
+++ b/src/java/org/apache/cassandra/db/Memtable.java
@@@ -169,9 -159,19 +170,19 @@@ public class Memtable implements Compar
this.initialComparator = metadata.comparator;
this.cfs = null;
this.allocator = null;
-this.columnsCollector = new
ColumnsCollector(metadata.partitionColumns());
+this.columnsCollector = new
ColumnsCollector(metadata.regularAndStaticColumns());
}
+ @VisibleForTesting
-public Memtable(CFMetaData metadata, long minTimestamp)
++public Memtable(TableMetadata metadata, long minTimestamp)
+ {
+ this.initialComparator = metadata.comparator;
+ this.cfs = null;
+ this.allocator = null;
-this.columnsCollector = new
ColumnsCollector(metadata.partitionColumns());
++this.columnsCollector = new
ColumnsCollector(metadata.regularAndStaticColumns());
+ this.minTimestamp = minTimestamp;
+ }
+
public MemtableAllocator getAllocator()
{
return allocator;
diff --cc test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
index 266b37d86a,8e8e9c94b7..b1c6599b5b
--- a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
+++ b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
@@@ -91,6 -96,17 +91,15 @@@ public class ColumnFamilyStoreTes
Keyspace.open(KEYSPACE2).getColumnFamilyStore(CF_STANDARD1).truncateBlocking();
}
+ @Test
+ public void testMemtableTimestamp() throws Throwable
+ {
+ assertEquals(Memtable.NO_MIN_TIMESTAMP,
- (new
Memtable(Keyspace.open(KEYSPACE1).getColumnFamilyStore(CF_STANDARD1).metadata,
++ (new
Memtable(Keyspace.open(KEYSPACE1).getColumnFamilyStore(CF_STANDARD1).metadata(),
+EncodingStats.NO_STATS.minTimestamp))
+ .getMinTimestamp());
+ }
+
@Test
// create two sstables, and verify that we only deserialize data from the
most recent one
public void testTimeSortedQuery()
-
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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository.
bereng pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 6c65c9e49e656fc1fc4ae23adda391d0e3d4f2b4
Merge: f17e431f24 7fe71274d0
Author: Bereng
AuthorDate: Thu Jan 12 07:07:30 2023 +0100
Merge branch 'cassandra-3.11' into cassandra-4.0
.circleci/generate.sh | 1 +
1 file changed, 1 insertion(+)
diff --cc .circleci/generate.sh
index f7e1b575ff,15c2849645..634a0807b4
--- a/.circleci/generate.sh
+++ b/.circleci/generate.sh
@@@ -18,7 -18,8 +18,8 @@@
#
BASEDIR=`dirname $0`
-BASE_BRANCH=cassandra-3.11
+BASE_BRANCH=cassandra-4.0
+ 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. marcuse pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 95e26ad1ab29b52e720edf9792eba100817cce9d Merge: ace3920239 0767c83416 Author: Marcus Eriksson AuthorDate: Fri Dec 23 14:43:01 2022 +0100 Merge branch 'cassandra-3.11' into cassandra-4.0 CHANGES.txt| 1 + .../compaction/TimeWindowCompactionStrategy.java | 14 + .../TimeWindowCompactionStrategyTest.java | 24 ++ .../org/apache/cassandra/schema/MockSchema.java| 19 + 4 files changed, 54 insertions(+), 4 deletions(-) diff --cc CHANGES.txt index 1cb2280828,ee21b34ebc..f737b1 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,12 -1,8 +1,13 @@@ -3.11.15 +4.0.8 + * Restore internode custom tracing on 4.0's new messaging system (CASSANDRA-17981) + * Harden parsing of boolean values in CQL in PropertyDefinitions (CASSANDRA-17878) + * Fix error message about type hints (CASSANDRA-17915) + * Fix possible race condition on repair snapshots (CASSANDRA-17955) + * Fix ASM bytecode version inconsistency (CASSANDRA-17873) +Merged from 3.11: * 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 test/unit/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategyTest.java index 38033f156e,15d2a2e705..88c63082cb --- a/test/unit/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategyTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategyTest.java @@@ -46,6 -47,7 +48,7 @@@ import org.apache.cassandra.db.RowUpdat import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.schema.KeyspaceParams; -import org.apache.cassandra.MockSchema; ++import org.apache.cassandra.schema.MockSchema; import org.apache.cassandra.utils.Pair; import static org.apache.cassandra.db.compaction.TimeWindowCompactionStrategy.getWindowBoundsInMillis; diff --cc test/unit/org/apache/cassandra/schema/MockSchema.java index 901acbfcf2,00..194f3db32f mode 100644,00..100644 --- a/test/unit/org/apache/cassandra/schema/MockSchema.java +++ b/test/unit/org/apache/cassandra/schema/MockSchema.java @@@ -1,239 -1,0 +1,250 @@@ +/* +* 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.schema; + +import java.io.File; +import java.io.IOException; +import java.io.RandomAccessFile; +import java.util.*; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.function.Function; + +import com.google.common.collect.ImmutableSet; + +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.db.*; +import org.apache.cassandra.db.marshal.UTF8Type; +import org.apache.cassandra.dht.Murmur3Partitioner; +import org.apache.cassandra.io.sstable.Component; +import org.apache.cassandra.io.sstable.Descriptor; +import org.apache.cassandra.io.sstable.IndexSummary; +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.ChannelProxy; +import org.apache.cassandra.io.util.FileHandle; +import org.apache.cassandra.io.util.FileUtils; +import org.apache.cassandra.io.util.Memory; +import org.apache.cassandra.utils.AlwaysPresentFilter; +import org.apache.cassandra.utils.ByteBufferUtil; + +import static org.apache.cassandra.service.ActiveRepairService.UNREPAIRED_SSTABLE; + +pub
[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit c2bbee2020af7b07eb478c10df21a8d081ec6a7e Merge: bba7ab3eca b7762e2aa2 Author: Brandon Williams AuthorDate: Mon Dec 5 10:06:17 2022 -0600 Merge branch 'cassandra-3.11' into cassandra-4.0 .build/dependency-check-suppressions.xml | 1 + CHANGES.txt | 1 + 2 files changed, 2 insertions(+) diff --cc .build/dependency-check-suppressions.xml index c833fd252b,d2ee33617d..481d8d0b3f --- a/.build/dependency-check-suppressions.xml +++ b/.build/dependency-check-suppressions.xml @@@ -37,20 -29,16 +37,21 @@@ CVE-2022-38750 CVE-2022-38751 CVE-2022-38752 + CVE-2022-41854 - - + + +^pkg:maven/net\.openhft/chronicle\-wire@.*$ +cpe:/a:wire:wire + + + +^pkg:maven/com\.google\.guava/guava@.*$ +CVE-2020-8908 + + ^pkg:maven/io\.netty/netty\-all@.*$ -CVE-2019-16869 -CVE-2019-20444 -CVE-2019-20445 -CVE-2020-7238 CVE-2021-21290 CVE-2021-21295 CVE-2021-21409 diff --cc CHANGES.txt index de9e6f07cf,4223a5cd8d..fc0d9fb2c6 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,24 -1,12 +1,25 @@@ -3.11.15 +4.0.8 + * Harden parsing of boolean values in CQL in PropertyDefinitions (CASSANDRA-17878) + * Fix error message about type hints (CASSANDRA-17915) + * Fix possible race condition on repair snapshots (CASSANDRA-17955) + * Fix ASM bytecode version inconsistency (CASSANDRA-17873) +Merged from 3.11: * 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) - -3.11.14 +4.0.7 + * Remove empty cq4 files in log directory to not fail the startup of BinLog (CASSANDRA-17933) + * Fix multiple BufferPool bugs (CASSANDRA-16681) + * Fix StorageService.getNativeaddress handling of IPv6 addresses (CASSANDRA-17945) + * Mitigate direct buffer memory OOM on replacements (CASSANDRA-17895) + * Fix repair failure on assertion if two peers have overlapping mismatching ranges (CASSANDRA-17900) + * Better handle null state in Gossip schema migration to avoid NPE (CASSANDRA-17864) + * HintedHandoffAddRemoveNodesTest now accounts for the fact that StorageMetrics.totalHints is not updated synchronously w/ writes (CASSANDRA-16679) + * Avoid getting hanging repairs due to repair message timeouts (CASSANDRA-17613) + * Prevent infinite loop in repair coordinator on FailSession (CASSANDRA-17834) +Merged from 3.11: * 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) - 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 38806e795b4f8745616f7c48c9bdae0760dcf7b5 Merge: 70478a1578 a44209cf43 Author: Mick Semb Wever AuthorDate: Thu Nov 10 14:41:04 2022 +0100 Merge branch 'cassandra-3.11' into cassandra-4.0 * cassandra-3.11: 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit cea850d67d5b726fe7ca9fef39c8578b46210155 Merge: 7dbbe6907b 7b7762826e Author: Andrés de la Peña AuthorDate: Tue Nov 8 17:49:06 2022 + Merge branch 'cassandra-3.11' into cassandra-4.0 .circleci/config.yml.HIGHRES | 315 --- .circleci/config.yml.LOWRES | 315 --- .circleci/config.yml.MIDRES | 315 --- .circleci/generate.sh| 113 +--- 4 files changed, 63 insertions(+), 995 deletions(-) diff --cc .circleci/config.yml.HIGHRES index e027af8dd6,5c55e714c8..ea6ae1ead7 --- a/.circleci/config.yml.HIGHRES +++ b/.circleci/config.yml.HIGHRES @@@ -8081,187 -2979,37 +8081,97 @@@ workflows - j8_unit_tests: requires: - start_j8_unit_tests -- build +- j8_build - - start_j8_unit_tests_repeat: - type: approval - - j8_unit_tests_repeat: - requires: - - start_j8_unit_tests_repeat - - j8_build - start_j8_jvm_dtests: type: approval - j8_jvm_dtests: requires: - start_j8_jvm_dtests -- build -- start_utests_long: +- j8_build - - start_j8_jvm_dtests_repeat: - type: approval - - j8_jvm_dtests_repeat: - requires: - - start_j8_jvm_dtests_repeat - - j8_build +- start_j8_cqlshlib_tests: type: approval -- utests_long: +- j8_cqlshlib_tests: requires: -- start_utests_long -- build -- start_utests_cdc: +- start_j8_cqlshlib_tests +- j8_build +- start_j11_unit_tests: type: approval -- utests_cdc: +- j11_unit_tests: requires: -- start_utests_cdc -- build -- start_utests_compression: +- start_j11_unit_tests +- j8_build - - start_j11_unit_tests_repeat: - type: approval - - j11_unit_tests_repeat: - requires: - - start_j11_unit_tests_repeat - - j8_build +- start_j8_utests_long: type: approval -- utests_compression: +- j8_utests_long: requires: -- start_utests_compression -- build -- start_utests_stress: +- start_j8_utests_long +- j8_build +- start_j11_utests_long: type: approval -- utests_stress: +- j11_utests_long: requires: -- start_utests_stress -- build +- start_j11_utests_long +- j8_build - - start_j8_utests_long_repeat: - type: approval - - j8_utests_long_repeat: - requires: - - start_j8_utests_long_repeat - - j8_build - - start_j11_utests_long_repeat: - type: approval - - j11_utests_long_repeat: - requires: - - start_j11_utests_long_repeat - - j8_build +- start_j8_utests_cdc: +type: approval +- j8_utests_cdc: +requires: +- start_j8_utests_cdc +- j8_build +- start_j11_utests_cdc: +type: approval +- j11_utests_cdc: +requires: +- start_j11_utests_cdc +- j8_build - - start_j8_utests_cdc_repeat: - type: approval - - j8_utests_cdc_repeat: - requires: - - start_j8_utests_cdc_repeat - - j8_build - - start_j11_utests_cdc_repeat: - type: approval - - j11_utests_cdc_repeat: - requires: - - start_j11_utests_cdc_repeat - - j8_build +- start_j8_utests_compression: +type: approval +- j8_utests_compression: +requires: +- start_j8_utests_compression +- j8_build +- start_j11_utests_compression: +type: approval +- j11_utests_compression: +requires: +- start_j11_utests_compression +- j8_build - - start_j8_utests_compression_repeat: - type: approval - - j8_utests_compression_repeat: - requires: - - start_j8_utests_compression_repeat - - j8_build - - start_j11_utests_compression_repeat: - type: approval - - j11_utests_compression_repeat: - requires: - - start_j11_utests_compression_repeat - - j8_build +- start_j8_utests_stress: +type: approval +- j8_utests_stress: +requires: +- start_j8_utests_stress +- j8_build +- start_j11_utests_stress: +type: approval +- j11_utests_stress: +requires: +- start_j11_utests_stress +- j8_build - - start_j8_utests_stress_repeat: - type: approval - - j8_utests_stress_repeat: - requires: - - start_j8_utests_stress_repeat - -
[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 17e694277597404aadfec664dfe4c11da7ed24a4 Merge: 5e705a8492 f9b2cd6f3f Author: Mick Semb Wever AuthorDate: Sat Nov 5 15:51:47 2022 +0100 Merge branch 'cassandra-3.11' into cassandra-4.0 * cassandra-3.11: ninja-fix antcall maybe-build-test needs inheritRefs (CASSANDRA-18000) build.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --cc build.xml index e11f5f6909,5e15f4923d..963761b230 --- a/build.xml +++ b/build.xml @@@ -953,58 -789,15 +953,58 @@@ - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@@ -1269,15 -1101,10 +1269,15 @@@ See CASSANDRA-16625 and CASSANDRA-18000 for further details. --> - + - ++ + + + +
[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 8f06ec372e20c55b85a083e43aa3b8e0993b648d Merge: 6152cb08db b82dca6f81 Author: Brandon Williams AuthorDate: Thu Nov 3 08:08:27 2022 -0500 Merge branch 'cassandra-3.11' into cassandra-4.0 - 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 842cbe28a6d1cee00fefcf73fcdd7330f07e78ea Merge: 35ef5b9957 deede44af5 Author: Andrés de la Peña AuthorDate: Fri Oct 28 13:54:40 2022 +0100 Merge branch 'cassandra-3.11' into cassandra-4.0 .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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit ac165325bc281364833013dd3bf5e1916fe2ac62 Merge: 8429229b7d ed07f7d6bc Author: Mick Semb Wever AuthorDate: Sun Oct 23 23:25:42 2022 +0200 Merge branch 'cassandra-3.11' into cassandra-4.0 * cassandra-3.11: Increment versions to 3.0.29, 3.11.15, 4.0.8 CHANGES.txt | 9 +++-- build.xml| 2 +- debian/changelog | 6 ++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --cc CHANGES.txt index 2827115775,005d97f1fb..02048723ef --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,21 -1,17 +1,26 @@@ - 4.0.7 -3.11.15 ++4.0.8 + * Fix ASM bytecode version inconsistency (CASSANDRA-17873) ++Merged from 3.11: + Merged from 3.0: + * Fix running Ant rat targets without git (CASSANDRA-17974) + + -3.11.14 ++4.0.7 + * Remove empty cq4 files in log directory to not fail the startup of BinLog (CASSANDRA-17933) + * Fix multiple BufferPool bugs (CASSANDRA-16681) + * Fix StorageService.getNativeaddress handling of IPv6 addresses (CASSANDRA-17945) + * Mitigate direct buffer memory OOM on replacements (CASSANDRA-17895) + * Fix repair failure on assertion if two peers have overlapping mismatching ranges (CASSANDRA-17900) + * Better handle null state in Gossip schema migration to avoid NPE (CASSANDRA-17864) + * HintedHandoffAddRemoveNodesTest now accounts for the fact that StorageMetrics.totalHints is not updated synchronously w/ writes (CASSANDRA-16679) + * Avoid getting hanging repairs due to repair message timeouts (CASSANDRA-17613) + * Prevent infinite loop in repair coordinator on FailSession (CASSANDRA-17834) +Merged from 3.11: * 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 0e152d2a85,b722e13074..88238c950b --- 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 42f0e458cd,c895b9fe57..b0e7e56a49 --- a/debian/changelog +++ b/debian/changelog @@@ -1,4 -1,10 +1,10 @@@ -cassandra (3.11.15) UNRELEASED; urgency=medium ++cassandra (4.0.8) UNRELEASED; urgency=medium + + * New release + - -- Mick Semb Wever Wed, 19 Oct 2022 10:27:23 +0200 ++ -- Mick Semb Wever Wed, 19 Oct 2022 10:57:06 +0200 + -cassandra (3.11.14) unstable; urgency=medium +cassandra (4.0.7) 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit a9df34c62a3596a9fc40de200adffe10b960146a Merge: 3251b85def c7d665dcc7 Author: Andrés de la Peña AuthorDate: Wed Oct 19 12:49:45 2022 +0100 Merge branch 'cassandra-3.11' into cassandra-4.0 .circleci/generate.sh | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --cc .circleci/generate.sh index 7b8a945b31,135f909620..fc29fd40a0 --- a/.circleci/generate.sh +++ b/.circleci/generate.sh @@@ -254,16 -249,13 +254,16 @@@ 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_UTESTS_FQLTOOL="* ]]; then ++if (! (echo "$env_vars" | grep -q "REPEATED_UTESTS_FQLTOOL=")); then + delete_job "utests_fqltool_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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 3251b85def05d963342e9799e046dd4a833ba37c Merge: 277fa4fca4 d465ac2dc9 Author: Mick Semb Wever AuthorDate: Wed Oct 19 11:32:42 2022 +0200 Merge branch 'cassandra-3.11' into cassandra-4.0 * cassandra-3.11: Prepare debian changelog for 3.11.14 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 9a24fa81e5f44476c9994b9d9a7aabf9b89f3f8b Merge: a124f099e0 95d0a936f9 Author: Mick Semb Wever AuthorDate: Tue Oct 18 22:53:05 2022 +0200 Merge branch 'cassandra-3.11' into cassandra-4.0 * cassandra-3.11: 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 d85f0c5357,3e0ab807ec..19fe614a29 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -13,7 -3,11 +13,8 @@@ Merged from 3.11 * 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 src/java/org/apache/cassandra/auth/jmx/AuthorizationProxy.java index 68cff0c12d,f2665085f3..36c552c700 --- a/src/java/org/apache/cassandra/auth/jmx/AuthorizationProxy.java +++ b/src/java/org/apache/cassandra/auth/jmx/AuthorizationProxy.java @@@ -23,10 -23,10 +23,11 @@@ import java.security.AccessControlConte import java.security.AccessController; import java.security.Principal; import java.util.Set; +import java.util.function.BooleanSupplier; import java.util.function.Function; -import java.util.function.Supplier; +import java.util.function.Predicate; import java.util.stream.Collectors; + import javax.management.InstanceNotFoundException; import javax.management.MBeanServer; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; - 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit a124f099e036a83b7ef2b69975b122dc83ba3e5f Merge: cc622a20e1 6b0cd7db04 Author: Brandon Williams AuthorDate: Tue Oct 18 11:16:20 2022 -0500 Merge branch 'cassandra-3.11' into cassandra-4.0 .build/dependency-check-suppressions.xml | 1 + CHANGES.txt | 1 + 2 files changed, 2 insertions(+) diff --cc .build/dependency-check-suppressions.xml index a065089feb,6ed01952be..c833fd252b --- a/.build/dependency-check-suppressions.xml +++ b/.build/dependency-check-suppressions.xml @@@ -21,16 -21,9 +21,17 @@@ --> https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd;> - + +^pkg:maven/com\.datastax\.cassandra/cassandra\-driver\-core@.*$ +CVE-2018-8016 ++CVE-2019-2684 +CVE-2020-13946 +CVE-2020-17516 +CVE-2021-44521 + + + ^pkg:maven/org\.yaml/snakeyaml@.*$ -CVE-2017-18640 CVE-2022-25857 CVE-2022-38749 CVE-2022-38750 diff --cc CHANGES.txt index 213c3fb918,830dca3b50..d85f0c5357 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -13,41 -3,17 +13,42 @@@ Merged from 3.11 * 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) + * Fix resetting schema (CASSANDRA-17819) + +4.0.6 + * Fix race condition on updating cdc size and advancing to next segment (CASSANDRA-17792) + * Add 'noboolean' rpm build for older distros like CentOS7 (CASSANDRA-17765) + * Fix default value for compaction_throughput_mb_per_sec in Config class to match the one in cassandra.yaml (CASSANDRA-17790) + * Fix Setting Virtual Table - update after startup config properties gc_log_threshold_in_ms, gc_warn_threshold_in_ms, + conf.index_summary_capacity_in_mb, prepared_statements_cache_size_mb, key_cache_size_in_mb, counter_cache_size_in_mb + (CASSANDRA-17737) + * Fix Settings Virtual Table - index_summary_resize_interval and index_summary_capacity were not updated after startup (CASSANDRA-17735) + * Clean up ScheduledExecutors, CommitLog, and MessagingService shutdown for in-JVM dtests (CASSANDRA-17731) + * Remove extra write to system table for prepared statements (CASSANDRA-17764) +Merged from 3.11: + * Document usage of closed token intervals in manual compaction (CASSANDRA-17575) +Merged from 3.0: * Improve libjemalloc resolution in bin/cassandra (CASSANDRA-15767) * Fix restarting of services on gossipping-only member (CASSANDRA-17752) + +4.0.5 + * Utilise BTree improvements to reduce garbage and improve throughput (CASSANDRA-15511) + * Make sure existing delayed tasks in StreamTransferTask cannot prevent clean shutdown (CASSANDRA-17706) + * SSL storage port in sstableloader is deprecated (CASSANDRA-17602) + * Fix counter write timeouts at ONE (CASSANDRA-17411) + * Fix NPE in getLocalPrimaryRangeForEndpoint (CASSANDRA-17680) + * Remove SSL storage port from sstableloader (CASSANDRA-17602) + * Allow Java 11 to satisfy RPM/Debian packaging (CASSANDRA-17669) + * Ensure FileStreamTask cannot compromise shared channel proxy for system table when interrupted (CASSANDRA-17663) + * silence benign SslClosedEngineException (CASSANDRA-17565) +Merged from 3.11: + * Creating of a keyspace on insufficient number of replicas should filter out gosspping-only members (CASSANDRA-17759) +Merged from 3.0: * Fix writetime and ttl functions forbidden for collections instead of multicell columns (CASSANDRA-17628) - * 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 4157e7a8e04655af4553d9003b9cb46897dddc2c Merge: 488c0c75a8 2e6528542b Author: Brandon Williams AuthorDate: Tue Oct 18 10:31:37 2022 -0500 Merge branch 'cassandra-3.11' into cassandra-4.0 .build/dependency-check-suppressions.xml | 7 +++ CHANGES.txt | 1 + 2 files changed, 8 insertions(+) diff --cc .build/dependency-check-suppressions.xml index 9a84700c64,bd6f90da62..a065089feb --- a/.build/dependency-check-suppressions.xml +++ b/.build/dependency-check-suppressions.xml @@@ -58,4 -46,47 +58,11 @@@ CVE-2021-43797 CVE-2022-24823 - - - -^pkg:maven/ch\.qos\.logback/logback\-core@.*$ -CVE-2017-5929 - - -^pkg:maven/ch\.qos\.logback/logback\-classic@.*$ -CVE-2017-5929 - - - - -^pkg:maven/com\.datastax\.cassandra/cassandra\-driver\-core@.*$ -CVE-2020-13946 -CVE-2020-17516 -CVE-2021-44521 - - - - -^pkg:maven/com\.google\.guava/guava@.*$ -CVE-2018-10237 -CVE-2020-8908 - - - - -^pkg:maven/org\.apache\.thrift/libthrift@.*$ -CVE-2015-3254 -CVE-2016-5397 -CVE-2018-1320 -CVE-2018-11798 -CVE-2019-0205 - - + + + ^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-databind@.*$ + CVE-2022-42003 + CVE-2022-42004 + + diff --cc CHANGES.txt index 4a85c97c53,cbe38d02b3..213c3fb918 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -1,5 +1,15 @@@ -3.11.14 +4.0.7 + * Remove empty cq4 files in log directory to not fail the startup of BinLog (CASSANDRA-17933) + * Fix multiple BufferPool bugs (CASSANDRA-16681) + * Fix StorageService.getNativeaddress handling of IPv6 addresses (CASSANDRA-17945) + * Mitigate direct buffer memory OOM on replacements (CASSANDRA-17895) + * Fix repair failure on assertion if two peers have overlapping mismatching ranges (CASSANDRA-17900) + * Better handle null state in Gossip schema migration to avoid NPE (CASSANDRA-17864) + * HintedHandoffAddRemoveNodesTest now accounts for the fact that StorageMetrics.totalHints is not updated synchronously w/ writes (CASSANDRA-16679) + * Avoid getting hanging repairs due to repair message timeouts (CASSANDRA-17613) + * Prevent infinite loop in repair coordinator on FailSession (CASSANDRA-17834) +Merged from 3.11: + * 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) - 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 756fb41512abc090fa22f73e70630b300458ebca Merge: 22ec7eee7f 70b0673d85 Author: Brandon Williams AuthorDate: Wed Sep 21 05:48:48 2022 -0500 Merge branch 'cassandra-3.11' into cassandra-4.0 .build/dependency-check-suppressions.xml | 9 + CHANGES.txt | 1 + 2 files changed, 10 insertions(+) diff --cc .build/dependency-check-suppressions.xml index 5ceca24397,28cbf593bd..9a84700c64 --- a/.build/dependency-check-suppressions.xml +++ b/.build/dependency-check-suppressions.xml @@@ -21,26 -21,23 +21,35 @@@ --> https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd;> - + +^pkg:maven/com\.datastax\.cassandra/cassandra\-driver\-core@.*$ +CVE-2018-8016 +CVE-2020-13946 +CVE-2020-17516 +CVE-2021-44521 + ++ ++ + ^pkg:maven/org\.yaml/snakeyaml@.*$ -CVE-2017-18640 + CVE-2022-25857 + CVE-2022-38749 + CVE-2022-38750 + CVE-2022-38751 + CVE-2022-38752 + - - + + +^pkg:maven/net\.openhft/chronicle\-wire@.*$ +cpe:/a:wire:wire + + + +^pkg:maven/com\.google\.guava/guava@.*$ +CVE-2020-8908 + + ^pkg:maven/io\.netty/netty\-all@.*$ -CVE-2019-16869 -CVE-2019-20444 -CVE-2019-20445 -CVE-2020-7238 CVE-2021-21290 CVE-2021-21295 CVE-2021-21409 diff --cc CHANGES.txt index 664791f43a,d3031cd294..76c64f2dc9 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,46 -1,15 +1,47 @@@ -3.11.14 +4.0.7 + * Mitigate direct buffer memory OOM on replacements (CASSANDRA-17895) + * Fix repair failure on assertion if two peers have overlapping mismatching ranges (CASSANDRA-17900) + * Better handle null state in Gossip schema migration to avoid NPE (CASSANDRA-17864) + * HintedHandoffAddRemoveNodesTest now accounts for the fact that StorageMetrics.totalHints is not updated synchronously w/ writes (CASSANDRA-16679) + * Avoid getting hanging repairs due to repair message timeouts (CASSANDRA-17613) + * Prevent infinite loop in repair coordinator on FailSession (CASSANDRA-17834) +Merged from 3.11: + * 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 scrubber falling into infinite loop when the last partition is broken (CASSANDRA-17862) + * Fix resetting schema (CASSANDRA-17819) + +4.0.6 + * Fix race condition on updating cdc size and advancing to next segment (CASSANDRA-17792) + * Add 'noboolean' rpm build for older distros like CentOS7 (CASSANDRA-17765) + * Fix default value for compaction_throughput_mb_per_sec in Config class to match the one in cassandra.yaml (CASSANDRA-17790) + * Fix Setting Virtual Table - update after startup config properties gc_log_threshold_in_ms, gc_warn_threshold_in_ms, + conf.index_summary_capacity_in_mb, prepared_statements_cache_size_mb, key_cache_size_in_mb, counter_cache_size_in_mb + (CASSANDRA-17737) + * Fix Settings Virtual Table - index_summary_resize_interval and index_summary_capacity were not updated after startup (CASSANDRA-17735) + * Clean up ScheduledExecutors, CommitLog, and MessagingService shutdown for in-JVM dtests (CASSANDRA-17731) + * Remove extra write to system table for prepared statements (CASSANDRA-17764) +Merged from 3.11: + * Document usage of closed token intervals in manual compaction (CASSANDRA-17575) +Merged from 3.0: * Improve libjemalloc resolution in bin/cassandra (CASSANDRA-15767) * Fix restarting of services on gossipping-only member (CASSANDRA-17752) + +4.0.5 + * Utilise BTree improvements to reduce garbage and improve throughput (CASSANDRA-15511) + * Make sure existing delayed tasks in StreamTransferTask cannot prevent clean shutdown (CASSANDRA-17706) + * SSL storage port in sstableloader is deprecated (CASSANDRA-17602) + * Fix counter write timeouts at ONE (CASSANDRA-17411) + * Fix NPE in getLocalPrimaryRangeForEndpoint (CASSANDRA-17680) + * Remove SSL storage port from sstableloader (CASSANDRA-17602) + * Allow Java 11 to satisfy RPM/Debian packaging (CASSANDRA-17669) + * Ensure FileStreamTask cannot compromise shared channel proxy for system table when interrupted (CASSANDRA-17663) + * silence benign
[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository.
jmckenzie pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 73bea0ac1e7d5d3dd35c50cb9bb4e691c9f5cd14
Merge: 0353df7542 ab481be81d
Author: Josh McKenzie
AuthorDate: Wed Aug 24 15:17:53 2022 -0400
Merge branch 'cassandra-3.11' into cassandra-4.0
-s ours; applying 4.0+ patch for CASSANDRA-17840
CHANGES.txt| 1 +
.../cassandra/service/pager/PagingState.java | 54 ---
.../apache/cassandra/utils/vint/VIntCoding.java| 3 +
.../service/pager/RandomizedPagingStateTest.java | 104 +
4 files changed, 150 insertions(+), 12 deletions(-)
diff --cc CHANGES.txt
index d1fb5626dd,c9f3b7630a..67a78a0a7e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,16 -1,8 +1,17 @@@
-3.11.14
+4.0.6
+ * Prevent infinite loop in repair coordinator on FailSession
(CASSANDRA-17834)
+ * Fix race condition on updating cdc size and advancing to next segment
(CASSANDRA-17792)
+ * Add 'noboolean' rpm build for older distros like CentOS7 (CASSANDRA-17765)
+ * Fix default value for compaction_throughput_mb_per_sec in Config class to
match the one in cassandra.yaml (CASSANDRA-17790)
+ * Fix Setting Virtual Table - update after startup config properties
gc_log_threshold_in_ms, gc_warn_threshold_in_ms,
+ conf.index_summary_capacity_in_mb, prepared_statements_cache_size_mb,
key_cache_size_in_mb, counter_cache_size_in_mb
+ (CASSANDRA-17737)
+ * Fix Settings Virtual Table - index_summary_resize_interval and
index_summary_capacity were not updated after startup (CASSANDRA-17735)
+ * Clean up ScheduledExecutors, CommitLog, and MessagingService shutdown for
in-JVM dtests (CASSANDRA-17731)
+ * Remove extra write to system table for prepared statements
(CASSANDRA-17764)
+Merged from 3.11:
+ * 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:
* Improve libjemalloc resolution in bin/cassandra (CASSANDRA-15767)
* Fix restarting of services on gossipping-only member (CASSANDRA-17752)
diff --cc src/java/org/apache/cassandra/utils/vint/VIntCoding.java
index 6961d9f191,68ebf42aea..c35f8345b3
--- a/src/java/org/apache/cassandra/utils/vint/VIntCoding.java
+++ b/src/java/org/apache/cassandra/utils/vint/VIntCoding.java
@@@ -103,8 -94,12 +103,11 @@@ public class VIntCodin
{
return getUnsignedVInt(input, readerIndex, input.limit());
}
-
public static long getUnsignedVInt(ByteBuffer input, int readerIndex, int
readerLimit)
{
+ if (readerIndex < 0)
+ throw new IllegalArgumentException("Reader index should be
non-negative, but was " + readerIndex);
+
if (readerIndex >= readerLimit)
return -1;
diff --cc
test/unit/org/apache/cassandra/service/pager/RandomizedPagingStateTest.java
index 00,4c9592a25d..1ef3b956d2
mode 00,100644..100644
---
a/test/unit/org/apache/cassandra/service/pager/RandomizedPagingStateTest.java
+++
b/test/unit/org/apache/cassandra/service/pager/RandomizedPagingStateTest.java
@@@ -1,0 -1,103 +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.service.pager;
+
+ import java.nio.ByteBuffer;
+ import java.util.Random;
+
+ import org.junit.Assert;
++import org.junit.BeforeClass;
+ import org.junit.Test;
+
-import org.apache.cassandra.config.CFMetaData;
+ import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.db.BufferClustering;
++import org.apache.cassandra.cql3.ColumnIdentifier;
+ import org.apache.cassandra.db.Clustering;
+ import org.apache.cassandra.db.marshal.BytesType;
+ import org.apache.cassandra.db.marshal.LongType;
+ import org.apache.cassandra.db.rows.BTreeRow;
+
[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 9ec945acf94ef298cf848f4af3b3a75b241d7a93 Merge: 9f97adf63c 6838fc552d Author: Brandon Williams AuthorDate: Thu Aug 18 05:56:49 2022 -0500 Merge branch 'cassandra-3.11' into cassandra-4.0 build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --cc build.xml index fead9b368d,a86ce1a260..02da8ff8ff --- a/build.xml +++ b/build.xml @@@ -1145,11 -974,6 +1145,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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 5fafa709fb3dbcc0c819f67a08027c4ca83a7c14 Merge: 6591048051 b492341eb5 Author: Mick Semb Wever AuthorDate: Tue Aug 16 21:46:14 2022 +0200 Merge branch 'cassandra-3.11' into cassandra-4.0 doc/modules/cassandra/examples/BASH/add_repo_keys.sh| 2 +- doc/modules/cassandra/examples/BASH/get_deb_package.sh | 4 ++-- doc/modules/cassandra/examples/RESULTS/add_yum_repo.result | 2 +- doc/modules/cassandra/pages/getting_started/installing.adoc | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --cc doc/modules/cassandra/examples/BASH/get_deb_package.sh index 891bed6427,0b866a8310..544512280a --- a/doc/modules/cassandra/examples/BASH/get_deb_package.sh +++ b/doc/modules/cassandra/examples/BASH/get_deb_package.sh @@@ -1,2 -1,2 +1,2 @@@ - $ echo "deb http://www.apache.org/dist/cassandra/debian 40x main" | sudo tee -a /etc/apt/sources.list.d/cassandra.sources.list - deb http://www.apache.org/dist/cassandra/debian 40x main -$ echo "deb https://debian.cassandra.apache.org 311x main" | sudo tee -a /etc/apt/sources.list.d/cassandra.sources.list -deb https://debian.cassandra.apache.org 311x main ++$ echo "deb https://debian.cassandra.apache.org 40x main" | sudo tee -a /etc/apt/sources.list.d/cassandra.sources.list ++deb https://debian.cassandra.apache.org 40x main diff --cc doc/modules/cassandra/examples/RESULTS/add_yum_repo.result index ba06f540f3,47ff95f355..24409f3328 --- a/doc/modules/cassandra/examples/RESULTS/add_yum_repo.result +++ b/doc/modules/cassandra/examples/RESULTS/add_yum_repo.result @@@ -1,6 -1,6 +1,6 @@@ [cassandra] name=Apache Cassandra - baseurl=https://downloads.apache.org/cassandra/redhat/40x/ -baseurl=https://redhat.cassandra.apache.org/311x/ ++baseurl=https://redhat.cassandra.apache.org/40x/ gpgcheck=1 repo_gpgcheck=1 gpgkey=https://downloads.apache.org/cassandra/KEYS diff --cc doc/modules/cassandra/pages/getting_started/installing.adoc index 77e1e6525a,96dbe520a7..c8ddcd0095 --- a/doc/modules/cassandra/pages/getting_started/installing.adoc +++ b/doc/modules/cassandra/pages/getting_started/installing.adoc @@@ -76,7 -72,7 +76,7 @@@ will install the binaries and configura include::example$BASH/docker_pull.sh[] - This `docker pull` command will get the latest version of the official -This `docker pull` command will get the specified version of the 'Docker Official' ++This `docker pull` command will get the latest version of the 'Docker Official' Apache Cassandra image available from the https://hub.docker.com/_/cassandra[Dockerhub]. [arabic, start=2] - 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository.
adelapena pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 174e0dc399c998a61eff670bd4980308a239482f
Merge: e5e13c02cc 4e410fc46d
Author: Andrés de la Peña
AuthorDate: Fri Aug 12 10:28:42 2022 +0100
Merge branch 'cassandra-3.11' into cassandra-4.0
CHANGES.txt| 2 ++
.../cassandra/db/ColumnFamilyStoreMBean.java | 7 +++-
.../cassandra/db/compaction/CompactionManager.java | 15
.../cassandra/service/StorageServiceMBean.java | 8 -
src/java/org/apache/cassandra/tools/NodeProbe.java | 8 +
.../apache/cassandra/tools/nodetool/Compact.java | 4 +--
.../compaction/LeveledCompactionStrategyTest.java | 40 +-
7 files changed, 57 insertions(+), 27 deletions(-)
diff --cc CHANGES.txt
index 8297050838,9abbbf54aa..be711d5c70
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,28 -1,11 +1,30 @@@
-3.11.14
+4.0.6
+ * Fix default value for compaction_throughput_mb_per_sec in Config class to
match the one in cassandra.yaml (CASSANDRA-17790)
+ * Fix Setting Virtual Table - update after startup config properties
gc_log_threshold_in_ms, gc_warn_threshold_in_ms,
+ conf.index_summary_capacity_in_mb, prepared_statements_cache_size_mb,
key_cache_size_in_mb, counter_cache_size_in_mb
+ (CASSANDRA-17737)
+ * Fix Settings Virtual Table - index_summary_resize_interval and
index_summary_capacity were not updated after startup (CASSANDRA-17735)
+ * Clean up ScheduledExecutors, CommitLog, and MessagingService shutdown for
in-JVM dtests (CASSANDRA-17731)
+ * Remove extra write to system table for prepared statements
(CASSANDRA-17764)
++Merged from 3.11:
+ * 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 restarting of services on gossipping-only member (CASSANDRA-17752)
+
+4.0.5
+ * Utilise BTree improvements to reduce garbage and improve throughput
(CASSANDRA-15511)
+ * Make sure existing delayed tasks in StreamTransferTask cannot prevent
clean shutdown (CASSANDRA-17706)
+ * SSL storage port in sstableloader is deprecated (CASSANDRA-17602)
+ * Fix counter write timeouts at ONE (CASSANDRA-17411)
+ * Fix NPE in getLocalPrimaryRangeForEndpoint (CASSANDRA-17680)
+ * Remove SSL storage port from sstableloader (CASSANDRA-17602)
+ * Allow Java 11 to satisfy RPM/Debian packaging (CASSANDRA-17669)
+ * Ensure FileStreamTask cannot compromise shared channel proxy for system
table when interrupted (CASSANDRA-17663)
+ * silence benign SslClosedEngineException (CASSANDRA-17565)
+Merged from 3.11:
+ * Creating of a keyspace on insufficient number of replicas should filter
out gosspping-only members (CASSANDRA-17759)
+Merged from 3.0:
* Fix writetime and ttl functions forbidden for collections instead of
multicell columns (CASSANDRA-17628)
- * 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)
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 933418e435,82e0bf2f5e..799eed3d0d
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@@ -889,9 -811,19 +889,18 @@@ public class CompactionManager implemen
return futures;
}
+ /**
+ * Forces a major compaction of specified token ranges of the specified
column family.
+ *
+ * The token ranges will be interpreted as closed intervals to match the
closed interval defined by the first and
+ * last keys of a sstable, even though the {@link Range} class is
suppossed to be half-open by definition.
+ *
+ * @param cfStore The column family store to be compacted.
+ * @param ranges The token ranges to be compacted, interpreted as closed
intervals.
+ */
public void forceCompactionForTokenRange(ColumnFamilyStore cfStore,
Collection> ranges)
{
-Callable> taskCreator = () -> {
+Callable taskCreator = () -> {
Collection sstables = sstablesInBounds(cfStore,
ranges);
if (sstables == null || sstables.isEmpty())
{
@@@ -916,14 -846,24 +925,20 @@@
{
for (AbstractCompactionTask task : tasks)
if (task != null)
-task.execute(metrics);
-}
-finally
-{
-
[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 821e7ab7bd7605842d9a898aa4022e15b60dd44d Merge: 04901913d6 eb5eda76c5 Author: Andrés de la Peña AuthorDate: Mon Aug 8 13:55:21 2022 +0100 Merge branch 'cassandra-3.11' into cassandra-4.0 - 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 65ef0c0c7fd55ac4443d87f4406f31a337bc6114 Merge: d51f90201b c2148980ce Author: Mick Semb Wever AuthorDate: Sat Jul 16 13:00:23 2022 +0200 Merge branch 'cassandra-3.11' into cassandra-4.0 - 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 5072bde5fb81580f7558031e50b2f6e988feaac2 Merge: c378874a9f ef6bce5084 Author: Mick Semb Wever AuthorDate: Fri Jul 8 12:23:52 2022 +0200 Merge branch 'cassandra-3.11' into cassandra-4.0 doc/modules/cassandra/pages/faq/index.adoc | 18 -- 1 file changed, 18 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 90e2502c6c7826bdb14cebcece81440307a7420e Merge: 48c1b7f9b4 bc8a260471 Author: Andrés de la Peña AuthorDate: Mon Jun 27 15:14:35 2022 +0100 Merge branch 'cassandra-3.11' into cassandra-4.0 CHANGES.txt| 1 + .../cassandra/pages/cql/cql_singlefile.adoc| 4 +- doc/modules/cassandra/pages/cql/dml.adoc | 3 + .../cassandra/cql3/selection/Selectable.java | 8 +- .../validation/entities/WritetimeOrTTLTest.java| 264 + 5 files changed, 276 insertions(+), 4 deletions(-) diff --cc CHANGES.txt index 9cff1452dd,cebe5fa7bf..0d52eae3b4 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,7 +1,14 @@@ -3.11.14 +4.0.5 + * SSL storage port in sstableloader is deprecated (CASSANDRA-17602) + * Fix counter write timeouts at ONE (CASSANDRA-17411) + * Fix NPE in getLocalPrimaryRangeForEndpoint (CASSANDRA-17680) + * Remove SSL storage port from sstableloader (CASSANDRA-17602) + * Allow Java 11 to satisfy RPM/Debian packaging (CASSANDRA-17669) + * Ensure FileStreamTask cannot compromise shared channel proxy for system table when interrupted (CASSANDRA-17663) + * silence benign SslClosedEngineException (CASSANDRA-17565) +Merged from 3.11: Merged from 3.0: + * Fix writetime and ttl functions forbidden for collections instead of multicell columns (CASSANDRA-17628) - * 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 48c1b7f9b47558b46e46694bf7583dd94ef1cd36 Merge: c8481836e6 34dce0066d Author: Brandon Williams AuthorDate: Tue Jun 21 09:46:41 2022 -0500 Merge branch 'cassandra-3.11' into cassandra-4.0 - 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 15ecaaed43da46406b3073d59a9896c3ffefbadc
Merge: 7da28ef378 51fb85a9db
Author: Mick Semb Wever
AuthorDate: Sun Jun 19 16:40:08 2022 +0200
Merge branch 'cassandra-3.11' into cassandra-4.0
.jenkins/Jenkinsfile | 48
1 file changed, 32 insertions(+), 16 deletions(-)
diff --cc .jenkins/Jenkinsfile
index 9ed102ac1b,75b9a66cbb..22c540fe47
--- a/.jenkins/Jenkinsfile
+++ b/.jenkins/Jenkinsfile
@@@ -49,187 -49,168 +49,194 @@@ pipeline
}
}
stage('Test') {
-parallel {
- stage('stress') {
-steps {
+ 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('fqltool') {
+ 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
+ fqltool = build job: "${env.JOB_NAME}-fqltool-test",
propagate: false
++ if (fqltool.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())
- }
- }
+if (fqltool.result != 'SUCCESS') unstable('fqltool test
failures')
+if (fqltool.result == 'FAILURE') currentBuild.result='FAILURE'
}
+ }
+ post {
+always {
+warnError('missing test xml files') {
+script {
+copyTestResults('fqltool-test', fqltool.getNumber())
+}
+}
}
}
- stage('units') {
-steps {
- script {
+}
+stage('units') {
+ steps {
+script {
def attempt = 1
- retry(2) {
+ while (attempt <=2) {
if (attempt > 1) {
sleep(60 * attempt)
}
attempt = attempt + 1
test = build job: "${env.JOB_NAME}-test", propagate: false
+ if (test.result != 'FAILURE') break
-}
-if (test.result != 'SUCCESS') unstable('unit test failures')
-if (test.result == 'FAILURE') currentBuild.result='FAILURE'
}
+ if (test.result != 'SUCCESS') unstable('unit test failures')
+ if (test.result == 'FAILURE') currentBuild.result='FAILURE'
}
-post {
- always {
- warnError('missing test xml files') {
- script {
- copyTestResults('test', test.getNumber())
- }
- }
- }
+ }
+ post {
+always {
+warnError('missing test xml files') {
+script {
+copyTestResults('test', test.getNumber())
+}
+}
}
}
- stage('long units') {
-steps {
- script {
+}
+stage('long units') {
+ steps {
+script {
def attempt = 1
[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository.
bereng pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit bb5b2d28896328df5996cb0fc870b012315f0e80
Merge: 2531dd1eba f884dda75b
Author: Bereng
AuthorDate: Tue Jun 14 06:58:30 2022 +0200
Merge branch 'cassandra-3.11' into cassandra-4.0
pylib/cqlshlib/formatting.py| 4 ++--
pylib/cqlshlib/test/test_unicode.py | 4
2 files changed, 6 insertions(+), 2 deletions(-)
diff --cc pylib/cqlshlib/test/test_unicode.py
index 836c2d9b8b,00..9fc052f58a
mode 100644,00..100644
--- a/pylib/cqlshlib/test/test_unicode.py
+++ b/pylib/cqlshlib/test/test_unicode.py
@@@ -1,75 -1,0 +1,79 @@@
+# coding=utf-8
+# 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.
+
+from __future__ import unicode_literals, with_statement
+
+import os
+import subprocess
+
+from .basecase import BaseTestCase
+from .cassconnect import (get_cassandra_connection, create_keyspace,
testrun_cqlsh)
++from cqlshlib.formatting import unicode_controlchars_re
+
+
+class TestCqlshUnicode(BaseTestCase):
+
+@classmethod
+def setUpClass(cls):
+s = get_cassandra_connection().connect()
+s.default_timeout = 60.0
+create_keyspace(s)
+s.execute('CREATE TABLE t (k int PRIMARY KEY, v text)')
+
+env = os.environ.copy()
+env['LC_CTYPE'] = 'UTF-8'
+cls.default_env = env
+
+def test_unicode_value_round_trip(self):
+with testrun_cqlsh(tty=True, env=self.default_env) as c:
+value = 'ϑΉӁװڜ'
+c.cmd_and_response("INSERT INTO t(k, v) VALUES (1, '%s');" %
(value,))
+output = c.cmd_and_response('SELECT * FROM t;')
+self.assertIn(value, output)
+
+def test_unicode_identifier(self):
+col_name = 'テスト'
+with testrun_cqlsh(tty=True, env=self.default_env) as c:
+c.cmd_and_response('ALTER TABLE t ADD "%s" int;' % (col_name,))
+# describe command reproduces name
+output = c.cmd_and_response('DESC t')
+self.assertIn('"%s" int' % (col_name,), output)
+c.cmd_and_response("INSERT INTO t(k, v) VALUES (1, '値');")
+# results header reproduces name
+output = c.cmd_and_response('SELECT * FROM t;')
+self.assertIn(col_name, output)
+
+def test_unicode_multiline_input(self): # CASSANDRA-16400
+with testrun_cqlsh(tty=True, env=self.default_env) as c:
+value = '値'
+c.send("INSERT INTO t(k, v) VALUES (1, \n'%s');\n" % (value,))
+c.read_to_next_prompt()
+output = c.cmd_and_response('SELECT v FROM t;')
+self.assertIn(value, output)
+
+def test_unicode_desc(self): # CASSANDRA-16539
+with testrun_cqlsh(tty=True, env=self.default_env) as c:
+v1 = 'ࠑ'
+v2 = 'Ξ'
+output = c.cmd_and_response('CREATE TYPE "%s" ( "%s" int );' %
(v1, v2))
+output = c.cmd_and_response('DESC TYPES;')
+self.assertIn(v1, output)
+output = c.cmd_and_response('DESC TYPE "%s";' %(v1,))
+self.assertIn(v2, output)
++
++def test_unicode_esc(self): # CASSANDRA-17617
++self.assertFalse(unicode_controlchars_re.match("01"))
-
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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository.
jonmeredith pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 943184b1948c57fcfecdcd968bab02e2fca2ea56
Merge: 52f6ac4af9 c9a7269874
Author: Jon Meredith
AuthorDate: Mon Jun 6 11:05:59 2022 -0600
Merge branch 'cassandra-3.11' into cassandra-4.0
.../distributed/test/MessageForwardingTest.java | 19 +++
1 file changed, 19 insertions(+)
diff --cc
test/distributed/org/apache/cassandra/distributed/test/MessageForwardingTest.java
index 153d7de706,895772364c..f7883b38a1
---
a/test/distributed/org/apache/cassandra/distributed/test/MessageForwardingTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/test/MessageForwardingTest.java
@@@ -24,16 -24,20 +24,20 @@@ import java.util.HashMap
import java.util.List;
import java.util.Map;
import java.util.UUID;
+ import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
+ import java.util.concurrent.TimeUnit;
+ import java.util.concurrent.TimeoutException;
+import java.util.stream.Collectors;
import java.util.stream.IntStream;
import java.util.stream.Stream;
import org.junit.Assert;
import org.junit.Test;
+ import org.apache.cassandra.concurrent.Stage;
-import org.apache.cassandra.concurrent.StageManager;
-import org.apache.cassandra.distributed.Cluster;
import org.apache.cassandra.distributed.api.ConsistencyLevel;
+import org.apache.cassandra.distributed.Cluster;
import org.apache.cassandra.distributed.impl.IsolatedExecutor;
import org.apache.cassandra.distributed.impl.TracingUtil;
import org.apache.cassandra.utils.UUIDGen;
@@@ -66,9 -69,23 +70,24 @@@ public class MessageForwardingTest exte
// Wait for each of the futures to complete before checking the
traces, don't care
// about the result so
//noinspection ResultOfMethodCallIgnored
-inserts.map(IsolatedExecutor::waitOn).count();
+
inserts.map(IsolatedExecutor::waitOn).collect(Collectors.toList());
+ // 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(() -> null);
++Future result = Stage.TRACING.submit(() -> null);
+ try
+ {
+ result.get(30, TimeUnit.SECONDS);
+ }
+ catch (ExecutionException | InterruptedException |
TimeoutException ex)
+ {
+ throw new RuntimeException(ex);
+ }
+ }));
+
+cluster.stream("dc1").forEach(instance ->
forwardFromCounts.put(instance.broadcastAddress().getAddress(), 0));
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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository.
adelapena pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit fbad08979edc6cb88169c92d071b000846d6974a
Merge: 36b73d70fb 8a9ba8866d
Author: Andrés de la Peña
AuthorDate: Tue May 31 17:11:36 2022 +0100
Merge branch 'cassandra-3.11' into cassandra-4.0
.../upgrade/CompactStorageColumnDeleteTest.java| 60
.../upgrade/CompactStorageHiddenColumnTest.java| 61
...CompactStorageImplicitNullInClusteringTest.java | 48 ++
.../upgrade/CompactStoragePagingTest.java | 55 +++
.../upgrade/CompactStorageUpgradeTest.java | 161 -
...ropCompactStorageNullClusteringValuesTest.java} | 4 +-
.../upgrade/DropCompactStorageTest.java| 51 +++
7 files changed, 276 insertions(+), 164 deletions(-)
diff --cc
test/distributed/org/apache/cassandra/distributed/upgrade/CompactStorageColumnDeleteTest.java
index 00,00..720a1b5db0
new file mode 100644
--- /dev/null
+++
b/test/distributed/org/apache/cassandra/distributed/upgrade/CompactStorageColumnDeleteTest.java
@@@ -1,0 -1,0 +1,60 @@@
++/*
++ * 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.distributed.upgrade;
++
++import org.junit.Test;
++
++import org.apache.cassandra.distributed.api.ConsistencyLevel;
++
++import static org.apache.cassandra.distributed.shared.AssertUtils.assertRows;
++import static org.apache.cassandra.distributed.shared.AssertUtils.row;
++
++public class CompactStorageColumnDeleteTest extends UpgradeTestBase
++{
++@Test
++public void testColumnDeleteWithCompactStorage() throws Throwable
++{
++new TestCase()
++.nodes(2)
++.nodesToUpgrade(2)
++.upgradesFrom(v30)
++.setup((cluster) -> {
++cluster.schemaChange("CREATE TABLE " + KEYSPACE + ".tbl (pk int,
ck int, v int, PRIMARY KEY (pk, ck)) WITH COMPACT STORAGE");
++})
++.runAfterNodeUpgrade((cluster, i) -> {
++for (int coord = 1; coord <= 2; coord++)
++{
++int v1 = coord * 10;
++int v2 = coord * 10;
++
++cluster.coordinator(coord).execute("INSERT INTO " + KEYSPACE
+ ".tbl (pk, ck, v) VALUES (?, ?, ?)", ConsistencyLevel.ALL, v1, v1, v1);
++cluster.coordinator(coord).execute("DELETE v FROM " +
KEYSPACE + ".tbl WHERE pk = ? AND ck = ?", ConsistencyLevel.ALL, v1, v1);
++assertRows(cluster.coordinator(coord).execute("SELECT * FROM
" + KEYSPACE + ".tbl WHERE pk = ?",
++
ConsistencyLevel.ALL,
++ v1));
++
++cluster.coordinator(coord).execute("INSERT INTO " + KEYSPACE
+ ".tbl (pk, ck, v) VALUES (?, ?, ?)", ConsistencyLevel.ALL, v2, v2, v2);
++assertRows(cluster.coordinator(coord).execute("SELECT * FROM
" + KEYSPACE + ".tbl WHERE pk = ?",
++
ConsistencyLevel.ALL,
++ v2),
++ row(v2, v2, v2));
++}
++}).run();
++}
++}
diff --cc
test/distributed/org/apache/cassandra/distributed/upgrade/CompactStorageHiddenColumnTest.java
index 00,00..4e5236c4a8
new file mode 100644
--- /dev/null
+++
b/test/distributed/org/apache/cassandra/distributed/upgrade/CompactStorageHiddenColumnTest.java
@@@ -1,0 -1,0 +1,61 @@@
++/*
++ * 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
++ *
[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 36b73d70fb3f3acb3c3a8591982a586b2192b6c0
Merge: 041c33e2d4 bb0e63fc38
Author: Mick Semb Wever
AuthorDate: Sat May 28 13:55:16 2022 +0200
Merge branch 'cassandra-3.11' into cassandra-4.0
.jenkins/Jenkinsfile | 382 ++-
1 file changed, 254 insertions(+), 128 deletions(-)
diff --cc .jenkins/Jenkinsfile
index 6e8c156c8a,31f06d280d..9ed102ac1b
--- a/.jenkins/Jenkinsfile
+++ b/.jenkins/Jenkinsfile
@@@ -27,149 -27,221 +27,246 @@@ pipeline
agent { label 'cassandra' }
stages {
stage('Init') {
-steps {
+ steps {
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"
++ script {
++def attempt = 1
++retry(2) {
++ if (attempt > 1) {
++sleep(60 * attempt)
+ }
++ attempt = attempt + 1
+ build job: "${env.JOB_NAME}-artifacts"
+ }
++ }
}
}
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'
++ parallel {
++stage('stress') {
++ steps {
++script {
++ def attempt = 1
++ retry(2) {
++if (attempt > 1) {
++ sleep(60 * attempt)
+}
- }
- post {
- always {
- warnError('missing test xml files') {
- script {
- copyTestResults('stress-test', stress.getNumber())
- }
- }
++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'
+}
+ }
- stage('fqltool') {
- steps {
- script {
- fqltool = build job: "${env.JOB_NAME}-fqltool-test",
propagate: false
- if (fqltool.result != 'SUCCESS') unstable('fqltool test
failures')
- if (fqltool.result == 'FAILURE')
currentBuild.result='FAILURE'
++ post {
++always {
++warnError('missing test xml files') {
++script {
++copyTestResults('stress-test', stress.getNumber())
++}
+}
+}
- post {
- always {
- warnError('missing test xml files') {
- script {
- copyTestResults('fqltool-test', fqltool.getNumber())
- }
++ }
++}
++stage('fqltool') {
++ steps {
+ script {
+ def attempt = 1
+ retry(2) {
+ if (attempt > 1) {
+ sleep(60 * attempt)
}
+ attempt = attempt + 1
- stress = build job: "${env.JOB_NAME}-stress-test",
propagate: false
++ fqltool = build job: "${env.JOB_NAME}-fqltool-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())
- }
- }
++if (fqltool.result != 'SUCCESS') unstable('fqltool test
failures')
++if (fqltool.result == 'FAILURE') currentBuild.result='FAILURE'
}
++ }
++ post {
++always {
++warnError('missing test xml files') {
++script {
++copyTestResults('fqltool-test', fqltool.getNumber())
++}
++}
}
[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. dcapwell pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 68406f07e424bb8f84fd11ba19d37513c1840a91 Merge: 7ea24711cc 76648a6534 Author: David Capwell AuthorDate: Wed May 25 14:01:41 2022 -0700 Merge branch 'cassandra-3.11' into cassandra-4.0 - 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository.
adelapena pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 5cf6db30f6b907e573c20b4f7b2958fb7e8995e1
Merge: af24242af9 0e1d068d92
Author: Andrés de la Peña
AuthorDate: Fri May 20 11:47:06 2022 +0100
Merge branch 'cassandra-3.11' into cassandra-4.0
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 | 31 +++-
.../cql3/conditions/ColumnConditionTest.java | 6 +-
.../cql3/validation/entities/CollectionsTest.java | 99
.../cassandra/io/sstable/CQLSSTableWriterTest.java | 171 -
7 files changed, 307 insertions(+), 14 deletions(-)
diff --cc CHANGES.txt
index bf7f8137c6,d796eb9449..6c31e17981
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,6 -1,6 +1,7 @@@
-3.11.14
+4.0.5
+Merged from 3.11:
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 src/java/org/apache/cassandra/cql3/Maps.java
index 6e7e07b576,e21fc6c5c2..3a9575c833
--- a/src/java/org/apache/cassandra/cql3/Maps.java
+++ b/src/java/org/apache/cassandra/cql3/Maps.java
@@@ -228,8 -184,9 +228,9 @@@ public abstract class Map
{
// Collections have this small hack that validate cannot be
called on a serialized object,
// but compose does the validation (so we're fine).
-Map m =
type.getSerializer().deserializeForNativeProtocol(value, version);
+Map m =
type.getSerializer().deserializeForNativeProtocol(value,
ByteBufferAccessor.instance, version);
- Map map = new
LinkedHashMap<>(m.size());
+ // We depend on Maps to be properly sorted by their keys, so
use a sorted map implementation here.
+ SortedMap map = new
TreeMap<>(type.getKeysType());
for (Map.Entry entry : m.entrySet())
map.put(type.getKeysType().decompose(entry.getKey()),
type.getValuesType().decompose(entry.getValue()));
return new Value(map);
diff --cc test/unit/org/apache/cassandra/cql3/CQLTester.java
index 8d0adbfe7c,996cfc8d5e..a8ca1e5d24
--- a/test/unit/org/apache/cassandra/cql3/CQLTester.java
+++ b/test/unit/org/apache/cassandra/cql3/CQLTester.java
@@@ -31,21 -28,12 +31,23 @@@ import java.util.*
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Consumer;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import java.util.stream.Collectors;
+import javax.management.MBeanServerConnection;
+import javax.management.remote.JMXConnector;
+import javax.management.remote.JMXConnectorFactory;
+import javax.management.remote.JMXConnectorServer;
+import javax.management.remote.JMXServiceURL;
+import javax.management.remote.rmi.RMIConnectorServer;
+
import com.google.common.base.Objects;
+import com.google.common.base.Strings;
import com.google.common.collect.ImmutableSet;
+ import com.google.common.collect.Iterables;
+
import org.junit.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@@ -218,39 -205,45 +220,39 @@@ public abstract class CQLTeste
public static void cleanup()
{
-// clean up commitlog
-String[] directoryNames = {
DatabaseDescriptor.getCommitLogLocation(), };
-for (String dirName : directoryNames)
-{
-File dir = new File(dirName);
-if (!dir.exists())
-throw new RuntimeException("No such directory: " +
dir.getAbsolutePath());
-FileUtils.deleteRecursive(dir);
-}
-
-File cdcDir = new File(DatabaseDescriptor.getCDCLogLocation());
-if (cdcDir.exists())
-FileUtils.deleteRecursive(cdcDir);
+ServerTestUtils.cleanup();
+}
-cleanupSavedCaches();
+/**
+ * Starts the JMX server. It's safe to call this method multiple times.
+ */
+public static void startJMXServer() throws Exception
+{
+if (jmxServer != null)
+return;
-// clean up data directory which are stored as data
directory/keyspace/data files
-for (String dirName : DatabaseDescriptor.getAllDataFileLocations())
-{
-File dir = new File(dirName);
-if (!dir.exists())
-throw new RuntimeException("No such directory: " +
dir.getAbsolutePath());
-FileUtils.deleteRecursive(dir);
-}
+InetAddress loopback = InetAddress.getLoopbackAddress();
+
[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 6158dccbcb7716d6f907311242b2693427340ec2 Merge: 27b5a017ea 01ebd9936f Author: Brandon Williams AuthorDate: Wed May 18 10:10:04 2022 -0500 Merge branch 'cassandra-3.11' into cassandra-4.0 .build/dependency-check-suppressions.xml | 1 + CHANGES.txt | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --cc .build/dependency-check-suppressions.xml index 7633085a82,85684ac124..5ceca24397 --- a/.build/dependency-check-suppressions.xml +++ b/.build/dependency-check-suppressions.xml @@@ -28,24 -58,21 +28,25 @@@ CVE-2020-17516 CVE-2021-44521 - - + +^pkg:maven/net\.openhft/chronicle\-wire@.*$ +cpe:/a:wire:wire + + + ^pkg:maven/com\.google\.guava/guava@.*$ -CVE-2018-10237 CVE-2020-8908 - - + -^pkg:maven/org\.apache\.thrift/libthrift@.*$ -CVE-2015-3254 -CVE-2016-5397 -CVE-2018-1320 -CVE-2018-11798 -CVE-2019-0205 +^pkg:maven/io\.netty/netty\-all@.*$ +CVE-2021-21290 +CVE-2021-21295 +CVE-2021-21409 +CVE-2021-37136 +CVE-2021-37137 +CVE-2021-43797 ++CVE-2022-24823 diff --cc CHANGES.txt index eff3c638a5,689fbfd2ba..bf7f8137c6 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,6 -1,6 +1,7 @@@ -3.11.14 +4.0.5 - Merged from 3.11.13: ++Merged from 3.11: 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit ac0266be693f8f36df11fa5c62eb044014d23fa0 Merge: bbb11086c4 d043217ff0 Author: Brandon Williams AuthorDate: Fri May 13 06:51:25 2022 -0500 Merge branch 'cassandra-3.11' into cassandra-4.0 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(-) - 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit a524cd4907bec475b71f1a9c75faecfadc6e6485
Merge: 4bab12c578 aeced876b5
Author: Brandon Williams
AuthorDate: Thu May 5 05:55:11 2022 -0500
Merge branch 'cassandra-3.11' into cassandra-4.0
CHANGES.txt| 1 +
src/java/org/apache/cassandra/tools/NodeProbe.java | 8 +++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --cc src/java/org/apache/cassandra/tools/NodeProbe.java
index 101aab3478,c63f2a1d87..0924155c04
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@@ -105,12 -100,9 +105,12 @@@ import org.apache.cassandra.utils.Nativ
*/
public class NodeProbe implements AutoCloseable
{
- private static final String fmtUrl =
"service:jmx:rmi:///jndi/rmi://[%s]:%d/jmxrmi";
+ private static final String fmtUrl =
"service:jmx:rmi:///jndi/rmi://%s:%d/jmxrmi";
private static final String ssObjName =
"org.apache.cassandra.db:type=StorageService";
private static final int defaultPort = 7199;
+
+static long JMX_NOTIFICATION_POLL_INTERVAL_SECONDS =
Long.getLong("cassandra.nodetool.jmx_notification_poll_interval_seconds",
TimeUnit.SECONDS.convert(5, TimeUnit.MINUTES));
+
final String host;
final int port;
private String username;
@@@ -200,8 -190,14 +200,14 @@@
*/
protected void connect() throws IOException
{
+ String host = this.host;
+ if (host.contains(":"))
+ {
+ // Use square brackets to surround IPv6 addresses to fix
CASSANDRA-7669 and CASSANDRA-17581
+ host = "[" + host + "]";
+ }
JMXServiceURL jmxUrl = new JMXServiceURL(String.format(fmtUrl, host,
port));
-Map env = new HashMap();
+Map env = new HashMap();
if (username != null)
{
String[] creds = { username, password };
-
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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit eac7b1de35dbae5b7507f422cce4cb1862bdad47 Merge: 2405d523fa 4bb1a07b5b Author: Brandon Williams AuthorDate: Thu Apr 28 09:09:11 2022 -0500 Merge branch 'cassandra-3.11' into cassandra-4.0 CHANGES.txt | 8 build.xml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --cc CHANGES.txt index 8b59569491,cb879685a2..03e25a8410 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,27 -1,13 +1,35 @@@ +4.0.5 + * Optimise BTree build,update and transform operations (CASSANDRA-15510) + 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: * Schema mutations may not be completed on drain (CASSANDRA-17524) + +4.0.4 + * Clean up schema migration coordinator and tests (CASSANDRA-17533) + * Shut repair task executor down without interruption to avoid compromising shared channel proxies (CASSANDRA-17466) + * Generate valid KEYSPACE / MATERIALIZED VIEW for CQL for views (CASSANDRA-17266) + * Fix timestamp tz parsing (CASSANDRA-17467) + * Suppress CVE-2021-44521 from driver (CASSANDRA-17459) + * Upgrade jackson to 2.13.2 (CASSANDRA-17460) + * Make sstableloader honour native port option (CASSANDRA-17210) + * Reject snapshot names with special character (CASSANDRA-15297) + * Fix ObjectSizes implementation and usages (CASSANDRA-17402) + * Fix race condition bug during local session repair (CASSANDRA-17335) + * Fix ignored streaming encryption settings in sstableloader (CASSANDRA-17367) + * Streaming tasks handle empty SSTables correctly (CASSANDRA-16349) + * Prevent SSTableLoader from doing unnecessary work (CASSANDRA-16349) + * emit warning on keyspace creation when replication factor is bigger than the number of nodes (CASSANDRA-16747) + * Fix snapshot true size calculation (CASSANDRA-17267) + * dropping of a materialized view creates a snapshot with dropped- prefix (CASSANDRA-17415) + * Validate existence of DCs when repairing (CASSANDRA-17407) +Merged from 3.0: * 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository.
jonmeredith pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 2405d523fa44d1379b4dd1df0874919299b00c44
Merge: 018c8e0d5e 804098e68b
Author: Jon Meredith
AuthorDate: Wed Apr 27 12:01:42 2022 -0600
Merge branch 'cassandra-3.11' into cassandra-4.0
CHANGES.txt| 2 +
.../org/apache/cassandra/concurrent/Stage.java | 55 --
.../config/CassandraRelevantProperties.java| 7 +++
.../apache/cassandra/service/StorageService.java | 19 ++--
.../distributed/test/ring/AutoBootstrapTest.java | 5 +-
5 files changed, 58 insertions(+), 30 deletions(-)
diff --cc CHANGES.txt
index 7a83979055,66b114a379..8b59569491
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,12 +1,27 @@@
-3.11.13
- * Upgrade slf4j to 1.7.25 (CASSANDRA-17474)
- * Upgrade jackson to 2.13.2 (CASSANDRA-17492)
+4.0.5
+ * Optimise BTree build,update and transform operations (CASSANDRA-15510)
++Merged from 3.0:
++ * Schema mutations may not be completed on drain (CASSANDRA-17524)
+
+4.0.4
+ * Clean up schema migration coordinator and tests (CASSANDRA-17533)
+ * Shut repair task executor down without interruption to avoid compromising
shared channel proxies (CASSANDRA-17466)
+ * Generate valid KEYSPACE / MATERIALIZED VIEW for CQL for views
(CASSANDRA-17266)
+ * Fix timestamp tz parsing (CASSANDRA-17467)
+ * Suppress CVE-2021-44521 from driver (CASSANDRA-17459)
+ * Upgrade jackson to 2.13.2 (CASSANDRA-17460)
+ * Make sstableloader honour native port option (CASSANDRA-17210)
+ * Reject snapshot names with special character (CASSANDRA-15297)
+ * Fix ObjectSizes implementation and usages (CASSANDRA-17402)
+ * Fix race condition bug during local session repair (CASSANDRA-17335)
+ * Fix ignored streaming encryption settings in sstableloader
(CASSANDRA-17367)
+ * Streaming tasks handle empty SSTables correctly (CASSANDRA-16349)
+ * Prevent SSTableLoader from doing unnecessary work (CASSANDRA-16349)
* 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)
+ * Validate existence of DCs when repairing (CASSANDRA-17407)
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)
diff --cc src/java/org/apache/cassandra/concurrent/Stage.java
index e00da7b0cc,ccb156501e..5efaf16cf6
--- a/src/java/org/apache/cassandra/concurrent/Stage.java
+++ b/src/java/org/apache/cassandra/concurrent/Stage.java
@@@ -49,229 -24,60 +49,256 @@@ import static java.util.stream.Collecto
public enum Stage
{
- READ ("ReadStage", "request",
DatabaseDescriptor::getConcurrentReaders,
DatabaseDescriptor::setConcurrentReaders,
Stage::multiThreadedLowSignalStage),
- MUTATION ("MutationStage", "request",
DatabaseDescriptor::getConcurrentWriters,
DatabaseDescriptor::setConcurrentWriters,
Stage::multiThreadedLowSignalStage),
- COUNTER_MUTATION ("CounterMutationStage", "request",
DatabaseDescriptor::getConcurrentCounterWriters,
DatabaseDescriptor::setConcurrentCounterWriters,
Stage::multiThreadedLowSignalStage),
- VIEW_MUTATION ("ViewMutationStage", "request",
DatabaseDescriptor::getConcurrentViewWriters,
DatabaseDescriptor::setConcurrentViewWriters,
Stage::multiThreadedLowSignalStage),
- GOSSIP("GossipStage", "internal", () -> 1,
null,
Stage::singleThreadedStage),
- REQUEST_RESPONSE ("RequestResponseStage", "request",
FBUtilities::getAvailableProcessors, null,
Stage::multiThreadedLowSignalStage),
- ANTI_ENTROPY ("AntiEntropyStage", "internal", () -> 1,
null,
Stage::singleThreadedStage),
- MIGRATION ("MigrationStage","internal", () -> 1,
null,
Stage::singleThreadedStage),
- MISC ("MiscStage", "internal", () ->
[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. dcapwell pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 1ebdc7e758ea3ab87d31cbaee0b8c6eb5efb3b1c Merge: ce6a65cb29 d7a9f41cf1 Author: David Capwell AuthorDate: Tue Apr 12 11:46:53 2022 -0700 Merge branch 'cassandra-3.11' into cassandra-4.0 build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --cc build.xml index 563022896b,be1168ec4d..eafaeb50c5 --- a/build.xml +++ b/build.xml @@@ -539,35 -382,30 +539,35 @@@ + + + + - + - - - - - - + + + + + + - + + - + - - + + - - - - + + + + - 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit c22accc46458d0a583afcf6a980f731cdcc94465 Merge: 897a251 f32d2b0 Author: Brandon Williams AuthorDate: Thu Mar 31 07:21:59 2022 -0500 Merge branch 'cassandra-3.11' into cassandra-4.0 - 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 897a2519bff89b4789ec128d9cfe7d6af9749a63 Merge: 0089858 a6864cc Author: Brandon Williams AuthorDate: Tue Mar 29 07:15:46 2022 -0500 Merge branch 'cassandra-3.11' into cassandra-4.0 - 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 4e19c9495142196e076ab2be73a30ce6a8e2cc9f Merge: 05fa924 3a7e5f8 Author: Brandon Williams AuthorDate: Fri Mar 25 15:02:04 2022 -0500 Merge branch 'cassandra-3.11' into cassandra-4.0 - 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 60269bff2bd2e11fefdbe11747cca75491e6c9df Merge: 4f5feac 234bdc8 Author: Brandon Williams AuthorDate: Fri Mar 25 06:15:41 2022 -0500 Merge branch 'cassandra-3.11' into cassandra-4.0 CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --cc CHANGES.txt index 1bdf518,4e73721..2b0b683 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,18 -1,9 +1,18 @@@ -3.11.13 - * Upgrade slf4j to 1.7.25 +4.0.4 + * Fix timestamp tz parsing (CASSANDRA-17467) + * Suppress CVE-2021-44521 from driver (CASSANDRA-17459) + * Upgrade jackson to 2.13.2 (CASSANDRA-17460) + * Make sstableloader honour native port option (CASSANDRA-17210) + * Reject snapshot names with special character (CASSANDRA-15297) + * Fix ObjectSizes implementation and usages (CASSANDRA-17402) + * Fix race condition bug during local session repair (CASSANDRA-17335) + * Fix ignored streaming encryption settings in sstableloader (CASSANDRA-17367) + * Streaming tasks handle empty SSTables correctly (CASSANDRA-16349) + * Prevent SSTableLoader from doing unnecessary work (CASSANDRA-16349) - Merged from 3.11: + * 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) + * Validate existence of DCs when repairing (CASSANDRA-17407) Merged from 3.0: * ConnectionLimitHandler may leaks connection count if remote connection drops (CASSANDRA-17252) * Require ant >= 1.10 (CASSANDRA-17428) - 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository.
jonmeredith pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit f8be6ea60cb9320bdcf1354a34bba053f6501d91
Merge: e773bbd 311e26b
Author: Jon Meredith
AuthorDate: Sat Mar 19 08:02:25 2022 -0600
Merge branch 'cassandra-3.11' into cassandra-4.0
CHANGES.txt| 1 +
.../transport/ConnectionLimitHandler.java | 44 --
2 files changed, 41 insertions(+), 4 deletions(-)
diff --cc CHANGES.txt
index 5c0477b,8e60deb..52d0bbb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,13 +1,18 @@@
-3.11.13
- * emit warning on keyspace creation when replication factor is bigger than
the number of nodes (CASSANDRA-16747)
+4.0.4
+ * Reject snapshot names with special character (CASSANDRA-15297)
+ * Fix ObjectSizes implementation and usages (CASSANDRA-17402)
+ * Fix race condition bug during local session repair (CASSANDRA-17335)
+ * Fix ignored streaming encryption settings in sstableloader
(CASSANDRA-17367)
+ * Streaming tasks handle empty SSTables correctly (CASSANDRA-16349)
+ * Prevent SSTableLoader from doing unnecessary work (CASSANDRA-16349)
+Merged from 3.11:
* 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)
+ * Validate existence of DCs when repairing (CASSANDRA-17407)
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)
* Suppress inapplicable CVEs (CASSANDRA-17368)
* Fix flaky test - test_cqlsh_completion.TestCqlshCompletion
(CASSANDRA-17338)
* Fixed TestCqlshOutput failing tests (CASSANDRA-17386)
diff --cc src/java/org/apache/cassandra/transport/ConnectionLimitHandler.java
index 2269036,271004d..24cf68d
--- a/src/java/org/apache/cassandra/transport/ConnectionLimitHandler.java
+++ b/src/java/org/apache/cassandra/transport/ConnectionLimitHandler.java
@@@ -21,17 -22,17 +22,20 @@@ import io.netty.channel.Channel
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter;
+ import io.netty.util.Attribute;
+ import io.netty.util.AttributeKey;
import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.utils.NoSpamLogger;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.net.InetAddress;
import java.net.InetSocketAddress;
+ import java.net.SocketAddress;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
@@@ -43,11 -44,37 +47,39 @@@
final class ConnectionLimitHandler extends ChannelInboundHandlerAdapter
{
private static final Logger logger =
LoggerFactory.getLogger(ConnectionLimitHandler.class);
-private static final AttributeKey addressAttributeKey =
AttributeKey.valueOf("address");
+private static final NoSpamLogger noSpamLogger =
NoSpamLogger.getLogger(logger, 1L, TimeUnit.MINUTES);
++private static final AttributeKey addressAttributeKey =
AttributeKey.valueOf(ConnectionLimitHandler.class, "address");
+
private final ConcurrentMap connectionsPerClient
= new ConcurrentHashMap<>();
private final AtomicLong counter = new AtomicLong(0);
+ // Keep the remote address as a channel attribute. The channel inactive
callback needs
+ // to know the entry into the connetionsPerClient map and depending on
the state of the remote
+ // an exception may be thrown trying to retrieve the address. Make sure
the same address used
+ // to increment is used for decrement.
+ private static InetAddress setRemoteAddressAttribute(Channel channel)
+ {
+ Attribute addressAttribute =
channel.attr(addressAttributeKey);
+ SocketAddress remoteAddress = channel.remoteAddress();
+ if (remoteAddress instanceof InetSocketAddress)
+ {
+ addressAttribute.setIfAbsent(((InetSocketAddress)
remoteAddress).getAddress());
+ }
+ else
+ {
-logger.warn("Remote address of unknown type: {}, skipping per-IP
connection limits",
++noSpamLogger.warn("Remote address of unknown type: {}, skipping
per-IP connection limits",
+ remoteAddress.getClass());
+ }
+ return addressAttribute.get();
+ }
+
+ private static InetAddress getRemoteAddressAttribute(Channel channel)
+ {
+ Attribute addressAttribute =
[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository.
paulo pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 5f50c797bc2746c6e5d37389fa020e708d55b0b4
Merge: d9bd035 95a6223
Author: Paulo Motta
AuthorDate: Mon Mar 14 17:18:15 2022 -0300
Merge branch 'cassandra-3.11' into cassandra-4.0
CHANGES.txt| 1 +
src/java/org/apache/cassandra/db/Directories.java | 8 ++--
.../apache/cassandra/db/ColumnFamilyStoreTest.java | 43
.../apache/cassandra/index/sasi/SASIIndexTest.java | 46 +-
4 files changed, 77 insertions(+), 21 deletions(-)
diff --cc CHANGES.txt
index e9b5b43,df9d4e1..86eae2b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,7 +1,13 @@@
-3.11.13
+4.0.4
+ * Fix ObjectSizes implementation and usages (CASSANDRA-17402)
+ * Fix race condition bug during local session repair (CASSANDRA-17335)
+ * Fix ignored streaming encryption settings in sstableloader
(CASSANDRA-17367)
+ * Streaming tasks handle empty SSTables correctly (CASSANDRA-16349)
+ * Prevent SSTableLoader from doing unnecessary work (CASSANDRA-16349)
+Merged from 3.11:
+ * 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)
+ * Validate existence of DCs when repairing (CASSANDRA-17407)
Merged from 3.0:
* Require ant >= 1.10 (CASSANDRA-17428)
* Disallow CONTAINS for UPDATE and DELETE (CASSANDRA-15266)
diff --cc src/java/org/apache/cassandra/db/Directories.java
index aa2881f,b37afa5..f09cdae
--- a/src/java/org/apache/cassandra/db/Directories.java
+++ b/src/java/org/apache/cassandra/db/Directories.java
@@@ -17,15 -17,22 +17,17 @@@
*/
package org.apache.cassandra.db;
-import java.io.File;
-import java.io.FileFilter;
-import java.io.IOError;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
+import java.io.*;
+import java.nio.file.*;
import java.util.*;
import java.util.concurrent.ThreadLocalRandom;
-import java.util.function.BiFunction;
+import java.util.function.BiPredicate;
+ import java.util.stream.Collectors;
+
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
+import com.google.common.collect.Maps;
+import com.google.common.util.concurrent.RateLimiter;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
@@@ -1154,9 -1037,24 +1156,9 @@@ public class Directorie
return StringUtils.join(s, File.separator);
}
-@VisibleForTesting
-static void overrideDataDirectoriesForTest(String loc)
-{
-for (int i = 0; i < dataDirectories.length; ++i)
-dataDirectories[i] = new DataDirectory(new File(loc));
-}
-
-@VisibleForTesting
-static void resetDataDirectoriesAfterTest()
-{
-String[] locations = DatabaseDescriptor.getAllDataFileLocations();
-for (int i = 0; i < locations.length; ++i)
-dataDirectories[i] = new DataDirectory(new File(locations[i]));
-}
-
private class SSTableSizeSummer extends DirectorySizeCalculator
{
- private final HashSet toSkip;
+ private final Set toSkip;
SSTableSizeSummer(File path, List files)
{
super(path);
@@@ -1167,39 -1065,11 +1169,39 @@@
public boolean isAcceptable(Path path)
{
File file = path.toFile();
-Pair pair =
SSTable.tryComponentFromFilename(path.getParent().toFile(), file.getName());
-return pair != null
-&& pair.left.ksname.equals(metadata.ksName)
-&& pair.left.cfname.equals(metadata.cfName)
-&& !toSkip.contains(file.getName());
+Descriptor desc = SSTable.tryDescriptorFromFilename(file);
+return desc != null
+&& desc.ksname.equals(metadata.keyspace)
+&& desc.cfname.equals(metadata.name)
- && !toSkip.contains(file);
++&& !toSkip.contains(file.getName());
+}
+}
+
+public static class SnapshotSizeDetails
+{
+public final long sizeOnDiskBytes;
+public final long dataSizeBytes;
+
+private SnapshotSizeDetails(long sizeOnDiskBytes, long dataSizeBytes)
+{
+this.sizeOnDiskBytes = sizeOnDiskBytes;
+this.dataSizeBytes = dataSizeBytes;
+}
+
+@Override
+public final int hashCode()
+{
+int hashCode = (int) sizeOnDiskBytes ^ (int) (sizeOnDiskBytes >>>
32);
+return 31 * (hashCode ^ (int) ((int) dataSizeBytes ^
[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit d9bd03552d955a76c0800e659d45ce8f2aa6ef69 Merge: bdeafa0 541d769 Author: Brandon Williams AuthorDate: Mon Mar 14 14:04:40 2022 -0500 Merge branch 'cassandra-3.11' into cassandra-4.0 CHANGES.txt | 1 + build.xml | 9 + 2 files changed, 10 insertions(+) diff --cc CHANGES.txt index 41c6574,a8954b7..e9b5b43 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -1,10 +1,15 @@@ -3.11.13 - * Validate existence of DCs when repairing (CASSANDRA-17407) +4.0.4 + * Fix ObjectSizes implementation and usages (CASSANDRA-17402) + * Fix race condition bug during local session repair (CASSANDRA-17335) + * Fix ignored streaming encryption settings in sstableloader (CASSANDRA-17367) + * Streaming tasks handle empty SSTables correctly (CASSANDRA-16349) + * Prevent SSTableLoader from doing unnecessary work (CASSANDRA-16349) +Merged from 3.11: * dropping of a materialized view creates a snapshot with dropped- prefix (CASSANDRA-17415) + * Validate existence of DCs when repairing (CASSANDRA-17407) 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) * Fix flaky test - test_cqlsh_completion.TestCqlshCompletion (CASSANDRA-17338) * Fixed TestCqlshOutput failing tests (CASSANDRA-17386) - 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 04c1289bb96a656bfc9cbf9eb7eb1ff9358f4b6f Merge: 59ea4f8 b18a9f0 Author: Brandon Williams AuthorDate: Tue Mar 8 17:20:50 2022 -0600 Merge branch 'cassandra-3.11' into cassandra-4.0 CHANGES.txt | 3 +++ src/java/org/apache/cassandra/service/StorageService.java | 7 +++ 2 files changed, 10 insertions(+) diff --cc CHANGES.txt index 9320244,c6708f5..af8983a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,8 +1,13 @@@ -3.11.13 - * Validate existence of DCs when repairing (CASSANDRA-17407) +4.0.4 + * Fix ObjectSizes implementation and usages (CASSANDRA-17402) + * Fix race condition bug during local session repair (CASSANDRA-17335) + * Fix ignored streaming encryption settings in sstableloader (CASSANDRA-17367) + * Streaming tasks handle empty SSTables correctly (CASSANDRA-16349) + * Prevent SSTableLoader from doing unnecessary work (CASSANDRA-16349) ++Merged from 3.11: + * dropping of a materialized view creates a snapshot with dropped- prefix (CASSANDRA-17415) ++ * Validate existence of DCs when repairing (CASSANDRA-17407) Merged from 3.0: - * 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) * Fixed TestCqlshOutput failing tests (CASSANDRA-17386) - 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 4fa541705c11af7dc9cc935f3698a64b08c5612d Merge: a8b67e3 a4c9a40 Author: Brandon Williams AuthorDate: Mon Feb 28 07:46:27 2022 -0600 Merge branch 'cassandra-3.11' into cassandra-4.0 .build/dependency-check-suppressions.xml | 3 +++ CHANGES.txt | 1 + 2 files changed, 4 insertions(+) diff --cc .build/dependency-check-suppressions.xml index 10709d7,ce51590..0003951 --- a/.build/dependency-check-suppressions.xml +++ b/.build/dependency-check-suppressions.xml @@@ -27,21 -56,21 +27,24 @@@ CVE-2020-13946 CVE-2020-17516 - - + +^pkg:maven/net\.openhft/chronicle\-wire@.*$ +cpe:/a:wire:wire + + + ^pkg:maven/com\.google\.guava/guava@.*$ -CVE-2018-10237 CVE-2020-8908 - - + -^pkg:maven/org\.apache\.thrift/libthrift@.*$ -CVE-2015-3254 -CVE-2016-5397 -CVE-2018-1320 -CVE-2018-11798 -CVE-2019-0205 +^pkg:maven/io\.netty/netty\-all@.*$ +CVE-2021-21290 +CVE-2021-21295 +CVE-2021-21409 ++CVE-2021-37136 ++CVE-2021-37137 ++CVE-2021-43797 diff --cc CHANGES.txt index 5dd0675,b055b12..ea4960b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,7 -1,6 +1,8 @@@ -3.11.13 +4.0.4 + * Streaming tasks handle empty SSTables correctly (CASSANDRA-16349) + * Prevent SSTableLoader from doing unnecessary work (CASSANDRA-16349) Merged from 3.0: + * Suppress inapplicable CVEs (CASSANDRA-17368) * Fix flaky test - test_cqlsh_completion.TestCqlshCompletion (CASSANDRA-17338) * Fixed TestCqlshOutput failing tests (CASSANDRA-17386) * Lazy transaction log replica creation allows incorrect replica content divergence during anticompaction (CASSANDRA-17273) - 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 85fd49f2cf11ba6587f87c552e9081f856c74f6f Merge: f8b3f60 593872c Author: Mick Semb Wever AuthorDate: Fri Feb 18 11:14:50 2022 +0100 Merge branch 'cassandra-3.11' into cassandra-4.0 CHANGES.txt | 1 + NEWS.txt| 18 ++ 2 files changed, 19 insertions(+) diff --cc CHANGES.txt index 92efa8d,a7a7eed..bc76062 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -4,46 -4,20 +4,47 @@@ 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) +4.0.3 + * Deprecate otc_coalescing_strategy, otc_coalescing_window_us, otc_coalescing_enough_coalesced_messages, + otc_backlog_expiration_interval_ms (CASSANDRA-17377) + * Improve start up processing of Incremental Repair information read from system.repairs (CASSANDRA-17342) -3.11.12 +4.0.2 + * Extend operator control over the UDF threading model for CVE-2021-44521 (CASSANDRA-17352) - * Upgrade snakeyaml to 1.26 in 3.11 (CASSANDRA=17028) + * Full Java 11 support (CASSANDRA-16894) + * Remove unused 'geomet' package from cqlsh path (CASSANDRA-17271) + * Removed unused 'cql' dependency (CASSANDRA-17247) + * Don't block gossip when clearing repair snapshots (CASSANDRA-17168) + * Deduplicate warnings for deprecated parameters (changed names) (CASSANDRA-17160) + * Update ant-junit to version 1.10.12 (CASSANDRA-17218) + * Add droppable tombstone metrics to nodetool tablestats (CASSANDRA-16308) + * Fix disk failure triggered when enabling FQL on an unclean directory (CASSANDRA-17136) + * Fixed broken classpath when multiple jars in build directory (CASSANDRA-17129) + * DebuggableThreadPoolExecutor does not propagate client warnings (CASSANDRA-17072) + * internode_send_buff_size_in_bytes and internode_recv_buff_size_in_bytes have new names. Backward compatibility with the old names added (CASSANDRA-17141) + * Remove unused configuration parameters from cassandra.yaml (CASSANDRA-17132) + * Queries performed with NODE_LOCAL consistency level do not update request metrics (CASSANDRA-17052) + * Fix multiple full sources can be select unexpectedly for bootstrap streaming (CASSANDRA-16945) + * Fix cassandra.yaml formatting of parameters (CASSANDRA-17131) + * Add backward compatibility for CQLSSTableWriter Date fields (CASSANDRA-17117) + * Push initial client connection messages to trace (CASSANDRA-17038) + * Correct the internode message timestamp if sending node has wrapped (CASSANDRA-16997) + * Avoid race causing us to return null in RangesAtEndpoint (CASSANDRA-16965) + * Avoid rewriting all sstables during cleanup when transient replication is enabled (CASSANDRA-16966) + * Prevent CQLSH from failure on Python 3.10 (CASSANDRA-16987) + * Avoid trying to acquire 0 permits from the rate limiter when taking snapshot (CASSANDRA-16872) + * Upgrade Caffeine to 2.5.6 (CASSANDRA-15153) + * Include SASI components to snapshots (CASSANDRA-15134) + * Fix missed wait latencies in the output of `nodetool tpstats -F` (CASSANDRA-16938) + * Remove all the state pollution between tests in SSTableReaderTest (CASSANDRA-16888) + * Delay auth setup until after gossip has settled to avoid unavailables on startup (CASSANDRA-16783) + * Fix clustering order logic in CREATE MATERIALIZED VIEW (CASSANDRA-16898) + * org.apache.cassandra.db.rows.ArrayCell#unsharedHeapSizeExcludingData includes data twice (CASSANDRA-16900) + * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies (CASSANDRA-16854) +Merged from 3.11: * 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) diff --cc NEWS.txt index 8599c36,1559aa8..eac73f5 --- a/NEWS.txt +++ b/NEWS.txt @@@ -18,6 -18,33 +18,24 @@@ CASSANDRA-14092.txt file If you use or plan to use very large TTLS (10 to 20 years), read CASSANDRA-14092.txt for more information. -PLEASE
[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository.
marcuse pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 702824a99ddf890603113992b09bf5c7780f6a6d
Merge: 894d33c e53ad64
Author: Marcus Eriksson
AuthorDate: Thu Feb 17 10:33:48 2022 +0100
Merge branch 'cassandra-3.11' into cassandra-4.0
CHANGES.txt| 2 +
.../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 | 161 -
.../{ => writers}/CompactionAwareWriterTest.java | 48 +-
9 files changed, 271 insertions(+), 18 deletions(-)
diff --cc CHANGES.txt
index c64b602,513a8af..4fa9ba3
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,46 -1,21 +1,48 @@@
-3.11.13
+4.0.4
+ 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)
+4.0.3
+ * Deprecate otc_coalescing_strategy, otc_coalescing_window_us,
otc_coalescing_enough_coalesced_messages,
+ otc_backlog_expiration_interval_ms (CASSANDRA-17377)
+ * Improve start up processing of Incremental Repair information read from
system.repairs (CASSANDRA-17342)
-3.11.12
- * Upgrade snakeyaml to 1.26 in 3.11 (CASSANDRA=17028)
+4.0.2
+ * Full Java 11 support (CASSANDRA-16894)
+ * Remove unused 'geomet' package from cqlsh path (CASSANDRA-17271)
+ * Removed unused 'cql' dependency (CASSANDRA-17247)
+ * Don't block gossip when clearing repair snapshots (CASSANDRA-17168)
+ * Deduplicate warnings for deprecated parameters (changed names)
(CASSANDRA-17160)
+ * Update ant-junit to version 1.10.12 (CASSANDRA-17218)
+ * Add droppable tombstone metrics to nodetool tablestats (CASSANDRA-16308)
+ * Fix disk failure triggered when enabling FQL on an unclean directory
(CASSANDRA-17136)
+ * Fixed broken classpath when multiple jars in build directory
(CASSANDRA-17129)
+ * DebuggableThreadPoolExecutor does not propagate client warnings
(CASSANDRA-17072)
+ * internode_send_buff_size_in_bytes and internode_recv_buff_size_in_bytes
have new names. Backward compatibility with the old names added
(CASSANDRA-17141)
+ * Remove unused configuration parameters from cassandra.yaml
(CASSANDRA-17132)
+ * Queries performed with NODE_LOCAL consistency level do not update request
metrics (CASSANDRA-17052)
+ * Fix multiple full sources can be select unexpectedly for bootstrap
streaming (CASSANDRA-16945)
+ * Fix cassandra.yaml formatting of parameters (CASSANDRA-17131)
+ * Add backward compatibility for CQLSSTableWriter Date fields
(CASSANDRA-17117)
+ * Push initial client connection messages to trace (CASSANDRA-17038)
+ * Correct the internode message timestamp if sending node has wrapped
(CASSANDRA-16997)
+ * Avoid race causing us to return null in RangesAtEndpoint (CASSANDRA-16965)
+ * Avoid rewriting all sstables during cleanup when transient replication is
enabled (CASSANDRA-16966)
+ * Prevent CQLSH from failure on Python 3.10 (CASSANDRA-16987)
+ * Avoid trying to acquire 0 permits from the rate limiter when taking
snapshot (CASSANDRA-16872)
+ * Upgrade Caffeine to 2.5.6 (CASSANDRA-15153)
+ * Include SASI components to snapshots (CASSANDRA-15134)
+ * Fix missed wait latencies in the output of `nodetool tpstats -F`
(CASSANDRA-16938)
+ * Remove all the state pollution between tests in SSTableReaderTest
(CASSANDRA-16888)
+ * Delay auth setup until after gossip has settled to avoid unavailables on
startup (CASSANDRA-16783)
+ * Fix clustering order logic in CREATE MATERIALIZED VIEW (CASSANDRA-16898)
+ * org.apache.cassandra.db.rows.ArrayCell#unsharedHeapSizeExcludingData
includes data twice (CASSANDRA-16900)
+ * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies
(CASSANDRA-16854)
+Merged from 3.11:
* 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
[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit b837a586f1df4813ea9026feaf95acdadf57b56b Merge: 2687cf1 f0bb299 Author: Brandon Williams AuthorDate: Wed Feb 16 17:27:58 2022 -0600 Merge branch 'cassandra-3.11' into cassandra-4.0 - 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. marcuse pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 2687cf1edf5d61379475f5a4e65a112239649b8a Merge: a87055d eeec360 Author: Marcus Eriksson AuthorDate: Wed Feb 16 10:17:14 2022 +0100 Merge branch 'cassandra-3.11' into cassandra-4.0 CHANGES.txt| 3 + .../org/apache/cassandra/db/lifecycle/LogFile.java | 22 +++--- .../cassandra/db/lifecycle/LogTransactionTest.java | 86 -- 3 files changed, 76 insertions(+), 35 deletions(-) diff --cc CHANGES.txt index 937bedf,402048f..c64b602 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,43 -1,20 +1,46 @@@ -3.11.13 -Merged from 3.0: ++4.0.4 + * Lazy transaction log replica creation allows incorrect replica content divergence during anticompaction (CASSANDRA-17273) + +4.0.3 + * Deprecate otc_coalescing_strategy, otc_coalescing_window_us, otc_coalescing_enough_coalesced_messages, + otc_backlog_expiration_interval_ms (CASSANDRA-17377) + * Improve start up processing of Incremental Repair information read from system.repairs (CASSANDRA-17342) -3.11.12 - * Upgrade snakeyaml to 1.26 in 3.11 (CASSANDRA=17028) +4.0.2 + * Full Java 11 support (CASSANDRA-16894) + * Remove unused 'geomet' package from cqlsh path (CASSANDRA-17271) + * Removed unused 'cql' dependency (CASSANDRA-17247) + * Don't block gossip when clearing repair snapshots (CASSANDRA-17168) + * Deduplicate warnings for deprecated parameters (changed names) (CASSANDRA-17160) + * Update ant-junit to version 1.10.12 (CASSANDRA-17218) + * Add droppable tombstone metrics to nodetool tablestats (CASSANDRA-16308) + * Fix disk failure triggered when enabling FQL on an unclean directory (CASSANDRA-17136) + * Fixed broken classpath when multiple jars in build directory (CASSANDRA-17129) + * DebuggableThreadPoolExecutor does not propagate client warnings (CASSANDRA-17072) + * internode_send_buff_size_in_bytes and internode_recv_buff_size_in_bytes have new names. Backward compatibility with the old names added (CASSANDRA-17141) + * Remove unused configuration parameters from cassandra.yaml (CASSANDRA-17132) + * Queries performed with NODE_LOCAL consistency level do not update request metrics (CASSANDRA-17052) + * Fix multiple full sources can be select unexpectedly for bootstrap streaming (CASSANDRA-16945) + * Fix cassandra.yaml formatting of parameters (CASSANDRA-17131) + * Add backward compatibility for CQLSSTableWriter Date fields (CASSANDRA-17117) + * Push initial client connection messages to trace (CASSANDRA-17038) + * Correct the internode message timestamp if sending node has wrapped (CASSANDRA-16997) + * Avoid race causing us to return null in RangesAtEndpoint (CASSANDRA-16965) + * Avoid rewriting all sstables during cleanup when transient replication is enabled (CASSANDRA-16966) + * Prevent CQLSH from failure on Python 3.10 (CASSANDRA-16987) + * Avoid trying to acquire 0 permits from the rate limiter when taking snapshot (CASSANDRA-16872) + * Upgrade Caffeine to 2.5.6 (CASSANDRA-15153) + * Include SASI components to snapshots (CASSANDRA-15134) + * Fix missed wait latencies in the output of `nodetool tpstats -F` (CASSANDRA-16938) + * Remove all the state pollution between tests in SSTableReaderTest (CASSANDRA-16888) + * Delay auth setup until after gossip has settled to avoid unavailables on startup (CASSANDRA-16783) + * Fix clustering order logic in CREATE MATERIALIZED VIEW (CASSANDRA-16898) + * org.apache.cassandra.db.rows.ArrayCell#unsharedHeapSizeExcludingData includes data twice (CASSANDRA-16900) + * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies (CASSANDRA-16854) +Merged from 3.11: * 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) diff --cc src/java/org/apache/cassandra/db/lifecycle/LogFile.java index a91af73,3550d66..9053034 --- a/src/java/org/apache/cassandra/db/lifecycle/LogFile.java +++ b/src/java/org/apache/cassandra/db/lifecycle/LogFile.java @@@ -66,7 -66,10 +66,8 @@@
[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 1923b542d0c53c3dc71bfbf84ac8c589462aecb7 Merge: 25012d2 317f507 Author: Mick Semb Wever AuthorDate: Mon Feb 7 15:08:45 2022 +0100 Merge branch 'cassandra-3.11' into cassandra-4.0 - 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository.
marcuse pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 66d792adda3cca9b82d25bff3921a28957853d16
Merge: 371add4 b022aec
Author: Marcus Eriksson
AuthorDate: Mon Feb 7 13:00:38 2022 +0100
Merge branch 'cassandra-3.11' into cassandra-4.0
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/security/ThreadAwareSecurityManager.java
index 86c8b5b,3d72559..3ff6820
--- a/src/java/org/apache/cassandra/security/ThreadAwareSecurityManager.java
+++ b/src/java/org/apache/cassandra/security/ThreadAwareSecurityManager.java
@@@ -66,13 -66,8 +67,14 @@@ public final class ThreadAwareSecurityM
private static final RuntimePermission CHECK_MEMBER_ACCESS_PERMISSION =
new RuntimePermission("accessDeclaredMembers");
private static final RuntimePermission MODIFY_THREAD_PERMISSION = new
RuntimePermission("modifyThread");
private static final RuntimePermission MODIFY_THREADGROUP_PERMISSION =
new RuntimePermission("modifyThreadGroup");
+ private static final RuntimePermission SET_SECURITY_MANAGER_PERMISSION =
new RuntimePermission("setSecurityManager");
+// Nashorn / Java 11
+private static final RuntimePermission NASHORN_GLOBAL_PERMISSION = new
RuntimePermission("nashorn.createGlobal");
+private static final ReflectPermission SUPPRESS_ACCESS_CHECKS_PERMISSION
= new ReflectPermission("suppressAccessChecks");
+private static final RuntimePermission DYNALINK_LOOKUP_PERMISSION = new
RuntimePermission("dynalink.getLookup");
+private static final RuntimePermission GET_CLASSLOADER_PERMISSION = new
RuntimePermission("getClassLoader");
+
private static volatile boolean installed;
public static void install()
-
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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 02f58d70d0de744b0891ac828598e60d9d5b4542 Merge: 965fe0d e4c6b8e Author: Mick Semb Wever AuthorDate: Fri Feb 4 14:45:48 2022 +0100 Merge branch 'cassandra-3.11' into cassandra-4.0 doc/modules/cassandra/pages/operating/hints.adoc | 1 - 1 file changed, 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.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository.
jonmeredith pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 965fe0decf4a354cafeffc33cddadc6d103de45d
Merge: 67f913a beb4563
Author: Jon Meredith
AuthorDate: Thu Feb 3 14:26:11 2022 -0700
Merge branch 'cassandra-3.11' into cassandra-4.0
.../apache/cassandra/service/StorageService.java | 14 --
.../cassandra/distributed/impl/Instance.java | 9 ++--
.../distributed/test/ring/AutoBootstrapTest.java | 56 ++
.../distributed/test/ring/BootstrapTest.java | 20
.../cassandra/streaming/StreamingTransferTest.java | 2 +-
5 files changed, 73 insertions(+), 28 deletions(-)
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index d78e0e8,49f3835..45fa119
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -4977,10 -4686,7 +4977,8 @@@ public class StorageService extends Not
if (!isFinalShutdown)
setMode(Mode.DRAINING, "flushing column families", false);
- // 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();
++// we don't want to start any new compactions while we are
draining
+ disableAutoCompaction();
// count CFs first, since forceFlush could block for the
flushWriter to get a queue slot empty
totalCFs = 0;
@@@ -5059,6 -4765,6 +5057,14 @@@
}
}
++@VisibleForTesting
++public void disableAutoCompaction()
++{
++for (Keyspace keyspace : Keyspace.all())
++for (ColumnFamilyStore cfs : keyspace.getColumnFamilyStores())
++cfs.disableAutoCompaction();
++}
++
/**
* 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
diff --cc test/distributed/org/apache/cassandra/distributed/impl/Instance.java
index 39ba770,1859742..9ea6d01
--- a/test/distributed/org/apache/cassandra/distributed/impl/Instance.java
+++ b/test/distributed/org/apache/cassandra/distributed/impl/Instance.java
@@@ -721,25 -739,19 +723,26 @@@ public class Instance extends IsolatedE
() ->
SecondaryIndexManager.shutdownAndWait(1L, MINUTES),
() ->
IndexSummaryManager.instance.shutdownAndWait(1L, MINUTES),
() ->
ColumnFamilyStore.shutdownExecutorsAndWait(1L, MINUTES),
-() ->
PendingRangeCalculatorService.instance.shutdownExecutor(1L, MINUTES),
-() -> BufferPool.shutdownLocalCleaner(1L,
MINUTES),
+() ->
PendingRangeCalculatorService.instance.shutdownAndWait(1L, MINUTES),
+() -> BufferPools.shutdownLocalCleaner(1L,
MINUTES),
() -> Ref.shutdownReferenceReaper(1L,
MINUTES),
() ->
Memtable.MEMORY_POOL.shutdownAndWait(1L, MINUTES),
+() ->
DiagnosticSnapshotService.instance.shutdownAndWait(1L, MINUTES),
+() -> ScheduledExecutors.shutdownAndWait(1L,
MINUTES),
() -> SSTableReader.shutdownBlocking(1L,
MINUTES),
- () ->
shutdownAndWait(Collections.singletonList(ActiveRepairService.repairCommandExecutor())),
- () -> ScheduledExecutors.shutdownAndWait(1L,
MINUTES)
-() ->
DiagnosticSnapshotService.instance.shutdownAndWait(1L, MINUTES)
++() ->
shutdownAndWait(Collections.singletonList(ActiveRepairService.repairCommandExecutor()))
);
+
++error = parallelRun(error, executor, () ->
ScheduledExecutors.shutdownAndWait(1L, MINUTES));
++
error = parallelRun(error, executor,
-() -> ScheduledExecutors.shutdownAndWait(1L,
MINUTES),
-(IgnoreThrowingRunnable)
MessagingService.instance()::shutdown
+CommitLog.instance::shutdownBlocking,
+// can only shutdown message once, so if the
test shutsdown an instance, then ignore the failure
+(IgnoreThrowingRunnable) () ->
MessagingService.instance().shutdown(1L, MINUTES, false, true)
);
error = parallelRun(error, executor,
-() ->
[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch cassandra-4.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git commit 67f913a7064e7db83ae92f2c55eaeae7db51055c Merge: 95257c0 bfab1fd Author: Andrés de la Peña AuthorDate: Wed Jan 26 11:43:14 2022 + Merge branch 'cassandra-3.11' into cassandra-4.0 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 cf4c206,579cea2..ca9b6b3 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,39 -1,17 +1,40 @@@ -3.11.12 - * Upgrade snakeyaml to 1.26 in 3.11 (CASSANDRA=17028) +4.0.2 + * Full Java 11 support (CASSANDRA-16894) + * Remove unused 'geomet' package from cqlsh path (CASSANDRA-17271) + * Removed unused 'cql' dependency (CASSANDRA-17247) + * Don't block gossip when clearing repair snapshots (CASSANDRA-17168) + * Deduplicate warnings for deprecated parameters (changed names) (CASSANDRA-17160) + * Update ant-junit to version 1.10.12 (CASSANDRA-17218) + * Add droppable tombstone metrics to nodetool tablestats (CASSANDRA-16308) + * Fix disk failure triggered when enabling FQL on an unclean directory (CASSANDRA-17136) + * Fixed broken classpath when multiple jars in build directory (CASSANDRA-17129) + * DebuggableThreadPoolExecutor does not propagate client warnings (CASSANDRA-17072) + * internode_send_buff_size_in_bytes and internode_recv_buff_size_in_bytes have new names. Backward compatibility with the old names added (CASSANDRA-17141) + * Remove unused configuration parameters from cassandra.yaml (CASSANDRA-17132) + * Queries performed with NODE_LOCAL consistency level do not update request metrics (CASSANDRA-17052) + * Fix multiple full sources can be select unexpectedly for bootstrap streaming (CASSANDRA-16945) + * Fix cassandra.yaml formatting of parameters (CASSANDRA-17131) + * Add backward compatibility for CQLSSTableWriter Date fields (CASSANDRA-17117) + * Push initial client connection messages to trace (CASSANDRA-17038) + * Correct the internode message timestamp if sending node has wrapped (CASSANDRA-16997) + * Avoid race causing us to return null in RangesAtEndpoint (CASSANDRA-16965) + * Avoid rewriting all sstables during cleanup when transient replication is enabled (CASSANDRA-16966) + * Prevent CQLSH from failure on Python 3.10 (CASSANDRA-16987) + * Avoid trying to acquire 0 permits from the rate limiter when taking snapshot (CASSANDRA-16872) + * Upgrade Caffeine to 2.5.6 (CASSANDRA-15153) + * Include SASI components to snapshots (CASSANDRA-15134) + * Fix missed wait latencies in the output of `nodetool tpstats -F` (CASSANDRA-16938) + * Remove all the state pollution between tests in SSTableReaderTest (CASSANDRA-16888) + * Delay auth setup until after gossip has settled to avoid unavailables on startup (CASSANDRA-16783) + * Fix clustering order logic in CREATE MATERIALIZED VIEW (CASSANDRA-16898) + * org.apache.cassandra.db.rows.ArrayCell#unsharedHeapSizeExcludingData includes data twice (CASSANDRA-16900) + * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies (CASSANDRA-16854) +Merged from 3.11: * 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) diff --cc NEWS.txt index 749b531,b04f4b4..1649ccd --- a/NEWS.txt +++ b/NEWS.txt @@@ -44,280 -47,26 +44,286 @@@ New feature Upgrading - -- Before you upgrade, if you are using `cassandra.auth_bcrypt_gensalt_log2_rounds` property, - confirm it is set to value lower than 31 otherwise Cassandra will fail to start. See CASSANDRA-9384 - for further details. You also need to regenerate passwords for users for who the password - was created while the above property was set to be more than 30 otherwise they
