This is an automated email from the ASF dual-hosted git repository.
paulo pushed a commit to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit da2dd2bfbc977811214c86a04ba9b3ae6dbf0ba3
Merge: 5c93731eee 8bb9c72f58
Author: Paulo Motta <pa...@apache.org>
AuthorDate: Mon Jan 23 17:27:32 2023 -0500
Merge branch 'cassandra-4.0' into cassandra-4.1
CHANGES.txt | 1 +
.../cassandra/db/compaction/CompactionManager.java | 6 +-
.../apache/cassandra/service/StorageService.java | 4 +
.../cassandra/distributed/action/GossipHelper.java | 12 +++
.../distributed/test/ring/CleanupFailureTest.java | 111 +++++++++++++++++++++
test/unit/org/apache/cassandra/db/CleanupTest.java | 6 +-
6 files changed, 133 insertions(+), 7 deletions(-)
diff --cc CHANGES.txt
index 05d2ab8019,789d8f7fa8..fc8eac05dc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
-4.0.8
+4.1.1
+ * Fix PAXOS2_COMMIT_AND_PREPARE_RSP serialisation AssertionError
(CASSANDRA-18164)
+ * Streaming progress virtual table lock contention can trigger
TCP_USER_TIMEOUT and fail streaming (CASSANDRA-18110)
+ * Fix perpetual load of denylist on read in cases where denylist can never
be loaded (CASSANDRA-18116)
+Merged from 4.0:
+ * 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)
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index b39c049c88,343f435f11..b0aa50caff
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -161,10 -131,8 +161,11 @@@ import static org.apache.cassandra.inde
import static
org.apache.cassandra.index.SecondaryIndexManager.isIndexColumnFamily;
import static org.apache.cassandra.net.NoPayload.noPayload;
import static org.apache.cassandra.net.Verb.REPLICATION_DONE_REQ;
-import static
org.apache.cassandra.schema.MigrationManager.evolveSystemKeyspace;
+import static org.apache.cassandra.service.ActiveRepairService.*;
+import static org.apache.cassandra.utils.Clock.Global.currentTimeMillis;
+import static org.apache.cassandra.utils.Clock.Global.nanoTime;
+import static org.apache.cassandra.utils.FBUtilities.now;
+ import static
org.apache.cassandra.utils.FBUtilities.getBroadcastAddressAndPort;
/**
* This abstraction contains the token/identifier of this node
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
