Merge branch 'cassandra-4.1' into trunk

CHANGES.txt

@@ -91,6 +91,7 @@
  * Add guardrail for ALTER TABLE ADD / DROP / REMOVE column operations (CASSANDRA-17495)
  * Rename DisableFlag class to EnableFlag on guardrails (CASSANDRA-17544)
 Merged from 4.1:
+ * Avoid ConcurrentModificationException in STCS/DTCS/TWCS.getSSTables (CASSANDRA-17977)
  * Fix ContentionStrategy backoff and Clock.waitUntil (CASSANDRA-18086)
  * Avoid schema mismatch problems on memtable API misconfiguration (CASSANDRA-18040)
  * Start Paxos auto repair in CassandraDaemon (CASSANDRA-18029)

src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java

@@ -237,7 +237,7 @@ public class DateTieredCompactionStrategy extends AbstractCompactionStrategy
     }
 
     @Override
-    protected Set<SSTableReader> getSSTables()
+    protected synchronized Set<SSTableReader> getSSTables()
     {
         return ImmutableSet.copyOf(sstables);
     }

src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java

@@ -336,7 +336,7 @@ public class SizeTieredCompactionStrategy extends AbstractCompactionStrategy
     }
 
     @Override
-    protected Set<SSTableReader> getSSTables()
+    protected synchronized Set<SSTableReader> getSSTables()
     {
         return ImmutableSet.copyOf(sstables);
     }

src/java/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategy.java

@@ -203,7 +203,7 @@ public class TimeWindowCompactionStrategy extends AbstractCompactionStrategy
     }
 
     @Override
-    protected Set<SSTableReader> getSSTables()
+    protected synchronized Set<SSTableReader> getSSTables()
     {
         return ImmutableSet.copyOf(sstables);
     }