This is an automated email from the ASF dual-hosted git repository.
dcapwell pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit dd4e3fa6df781e8debb3be88fcee4968ace56b7f
Merge: bbcf92b2c4 1b1f88e38a
Author: ci worker <dcapw...@apache.org>
AuthorDate: Wed May 1 14:35:14 2024 -0700
Merge branch 'cassandra-5.0' into trunk
CHANGES.txt | 1 +
.../db/compaction/AbstractStrategyHolder.java | 1 +
.../db/compaction/CompactionStrategyHolder.java | 6 ++++
.../db/compaction/CompactionStrategyManager.java | 18 +++++++++-
.../db/compaction/PendingRepairHolder.java | 12 +++++++
.../db/compaction/PendingRepairManager.java | 11 ++++++-
.../org/apache/cassandra/db/lifecycle/Tracker.java | 2 ++
.../apache/cassandra/repair/RepairCoordinator.java | 15 +++++++++
.../cassandra/repair/RepairMessageVerbHandler.java | 3 ++
.../distributed/test/DistributedRepairUtils.java | 34 +++++++++++++++++++
.../distributed/test/RepairCoordinatorFast.java | 3 ++
.../test/RepairCoordinatorNeighbourDown.java | 3 ++
.../repair/ConcurrentIrWithPreviewFuzzTest.java | 2 +-
.../cassandra/repair/FailingRepairFuzzTest.java | 1 +
.../org/apache/cassandra/repair/FuzzTestBase.java | 38 ++++++++++++++++++++--
15 files changed, 144 insertions(+), 6 deletions(-)
diff --cc CHANGES.txt
index 54f370529b,ac41c7c180..19eb240b42
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -74,9 -37,11 +74,10 @@@ Merged from 4.1
* Fix hints delivery for a node going down repeatedly (CASSANDRA-19495)
* Do not go to disk for reading hints file sizes (CASSANDRA-19477)
* Fix system_views.settings to handle array types (CASSANDRA-19475)
- * Memoize Cassandra verion and add a backoff interval for failed schema
pulls (CASSANDRA-18902)
* Fix StackOverflowError on ALTER after many previous schema changes
(CASSANDRA-19166)
+ * Memoize Cassandra verion (CASSANDRA-18902)
Merged from 4.0:
+ * IR may leak SSTables with pending repair when coming from streaming
(CASSANDRA-19182)
* Streaming exception race creates corrupt transaction log files that
prevent restart (CASSANDRA-18736)
* Fix CQL tojson timestamp output on negative timestamp values before
Gregorian calendar reform in 1582 (CASSANDRA-19566)
* Fix few types issues and implement types compatibility tests
(CASSANDRA-19479)
diff --cc
test/distributed/org/apache/cassandra/distributed/test/RepairCoordinatorNeighbourDown.java
index 7815cbe3bc,590c65aa72..1d6060c082
---
a/test/distributed/org/apache/cassandra/distributed/test/RepairCoordinatorNeighbourDown.java
+++
b/test/distributed/org/apache/cassandra/distributed/test/RepairCoordinatorNeighbourDown.java
@@@ -41,8 -39,8 +41,9 @@@ import org.apache.cassandra.service.Sto
import org.apache.cassandra.utils.FBUtilities;
import static java.lang.String.format;
+import static
org.apache.cassandra.config.CassandraRelevantProperties.TEST_JVM_SHUTDOWN_MESSAGING_GRACEFULLY;
import static org.apache.cassandra.distributed.api.IMessageFilters.Matcher.of;
+ import static
org.apache.cassandra.distributed.test.DistributedRepairUtils.assertNoSSTableLeak;
import static
org.apache.cassandra.distributed.test.DistributedRepairUtils.assertParentRepairFailedWithMessageContains;
import static
org.apache.cassandra.distributed.test.DistributedRepairUtils.assertParentRepairNotExist;
import static
org.apache.cassandra.distributed.test.DistributedRepairUtils.getRepairExceptions;
diff --cc test/unit/org/apache/cassandra/repair/FuzzTestBase.java
index ff205554f8,b389231c68..40959a21e1
--- a/test/unit/org/apache/cassandra/repair/FuzzTestBase.java
+++ b/test/unit/org/apache/cassandra/repair/FuzzTestBase.java
@@@ -50,6 -50,9 +50,9 @@@ import javax.annotation.Nullable
import com.google.common.collect.Iterables;
import com.google.common.collect.Maps;
-import org.junit.Before;
+ import com.google.common.collect.Sets;
+
++import org.apache.cassandra.config.UnitConfigOverride;
import org.junit.BeforeClass;
import accord.utils.DefaultRandom;
@@@ -69,7 -71,7 +72,6 @@@ import org.apache.cassandra.concurrent.
import org.apache.cassandra.concurrent.SimulatedExecutorFactory;
import org.apache.cassandra.concurrent.Stage;
import org.apache.cassandra.config.DatabaseDescriptor;
--import org.apache.cassandra.config.UnitConfigOverride;
import org.apache.cassandra.cql3.CQLTester;
import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.Digest;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
