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 6fcd0cd094c5b329d69a63f129d82dc772bef22f Merge: 998f42984f 8fa9a75fc2 Author: Marcus Eriksson <[email protected]> AuthorDate: Tue Jun 9 08:34:50 2026 +0200 Merge branch 'cassandra-6.0' into trunk CHANGES.txt | 6 + src/java/org/apache/cassandra/gms/Gossiper.java | 8 +- .../apache/cassandra/service/CassandraDaemon.java | 10 +- .../apache/cassandra/service/StorageService.java | 55 ++++++- .../org/apache/cassandra/tcm/ClusterMetadata.java | 5 - src/java/org/apache/cassandra/tcm/Startup.java | 2 + .../tcm/listeners/InitializationListener.java | 36 ----- .../org/apache/cassandra/tcm/log/LocalLog.java | 2 - .../apache/cassandra/tcm/membership/Directory.java | 167 +++++++++++++-------- .../apache/cassandra/tcm/ownership/TokenMap.java | 18 +-- .../tcm/sequences/SingleNodeSequences.java | 40 ++++- .../tcm/sequences/UnbootstrapAndLeave.java | 15 +- .../cassandra/tcm/transformations/Register.java | 3 + .../test/ring/BootstrapCompactionTest.java | 93 ++++++++++++ .../distributed/test/ring/BootstrapTest.java | 24 ++- .../ClusterMetadataAbortedBootstrapRejoinTest.java | 109 ++++++++++++++ .../distributed/test/tcm/LostCommitReqResTest.java | 135 +++++++++++++++++ ...usterMetadataUpgradePreparedStatementsTest.java | 110 ++++++++++++++ .../microbench/DirectorySerializationBench.java | 126 ++++++++++++++++ .../compaction/CompactionStrategyManagerTest.java | 21 ++- 20 files changed, 832 insertions(+), 153 deletions(-) diff --cc CHANGES.txt index 6a287b842a,628ba1f48f..2fcbd4ca3d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,10 +1,14 @@@ -6.0-alpha2 +7.0 + * 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: + * Don’t leave autocompaction disabled during bootstrap and replace (CASSANDRA-21236) + * Make nodetool abortbootstrap more robust (CASSANDRA-21235) + * Don't clear prepared statement cache on nodetool cms initialize (CASSANDRA-21234) + * Improve performance when deserializing cluster metadata (CASSANDRA-21224) + * Minor TokenMap performance improvement (CASSANDRA-21223) + * Handle lost response when committing PrepareMove (CASSANDRA-21222) * SEPExecutor.maybeExecuteImmediately does not always execute tasks immediately despite available worker capacity (CASSANDRA-21429) * Safely regain ranges and delete retired command stores (CASSANDRA-21212) * Reduce memory allocations in miscellaneous places along read path (CASSANDRA-21360) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
