This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 091062af12d937ff1e81086aab0d00fddbf5b276 Merge: b141e507e9 a2376d9127 Author: Caleb Rackliffe <[email protected]> AuthorDate: Thu Aug 13 17:30:45 2026 -0500 Merge branch 'cassandra-6.0' into trunk * cassandra-6.0: Ensure transferred_ranges reset on decommision re-attempt when pending ranges cannot be proven continous CHANGES.txt | 1 + .../org/apache/cassandra/db/SystemKeyspace.java | 31 ++++++- .../cassandra/tcm/sequences/RemoveNodeStreams.java | 2 +- .../tcm/sequences/SingleNodeSequences.java | 5 ++ .../tcm/sequences/UnbootstrapStreams.java | 5 +- .../distributed/test/ring/BootstrapTest.java | 7 +- .../distributed/test/ring/DecommissionTest.java | 98 +++++++++++++++++++++- 7 files changed, 140 insertions(+), 9 deletions(-) diff --cc CHANGES.txt index 746cd51acc,bbfb9c2ba8..47af8e6573 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,12 -1,5 +1,13 @@@ -6.0-alpha3 +7.0 + * Add prepared statement cache stats to nodetool info (CASSANDRA-14366) + * Don't increment client metrics on messaging service connection unpause (CASSANDRA-21491) + * Add nodetool getreplicas (CASSANDRA-17665) + * Implementation of CEP-49: Hardware-accelerated compression (CASSANDRA-20975) + * Avoid using ObjectUtils.getFirstNonNull in Schema (CASSANDRA-21394) + * Allow nodetool garbagecollect to take a user defined list of SSTables (CASSANDRA-16767) + * Add a guardrail for misprepared statements (CASSANDRA-21139) +Merged from 6.0: + * Ensure transferred_ranges reset on decommision re-attempt when pending ranges cannot be proven continous (CASSANDRA-16290) * Add blob type support to SAI (CASSANDRA-20012) * Fix deserialization of column masks in cluster metadata (CASSANDRA-21549) * Caffeine caches in CompressionDictionaryCache and ZstdDictionaryCompressor should specify an executor explicitly (CASSANDRA-21557) diff --cc test/distributed/org/apache/cassandra/distributed/test/ring/DecommissionTest.java index f6ba5c33a1,01d4b94fb5..ec91e9d894 --- a/test/distributed/org/apache/cassandra/distributed/test/ring/DecommissionTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/ring/DecommissionTest.java @@@ -286,7 -380,7 +380,7 @@@ public class DecommissionTest extends T .start()) { populate(cluster, 0, 100, 1, 2, ConsistencyLevel.QUORUM); -- cluster.get(3).nodetoolResult("decommission", "--force").asserts().success(); ++ cluster.get(3).nodetoolResult("decommission").asserts().success(); int[] remainingNodes = {1, 2, 4}; Set<String> expectedPeers = new HashSet<>(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
