CASSANDRA-21196: Include tools in applyCompatibilityMode check

thisteensy · thisteensy · commit dca01cffc8aa · 2026-03-06T13:55:27.000+01:00
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,4 +1,5 @@
 5.1
+ * Include tools in applyCompatibilityMode to ensure they are not limited in sstable formats they support (CASSANDRA-21196)
  * Harden the possible range of values for max dictionary size and max total sample size for dictionary training (CASSANDRA-21194)
  * Implement a guardrail ensuring that minimum training frequency parameter is provided in ZstdDictionaryCompressor (CASSANDRA-21192)
  * Replace manual referencing with ColumnFamilyStore.selectAndReference when training a dictionary (CASSANDRA-21188)
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -1896,7 +1896,7 @@ private static void validateSSTableFormatFactories(Iterable<SSTableFormat.Factor
 
     private static void applyCompatibilityMode()
     {
-        if (isClientInitialized())
+        if (isClientInitialized() || isToolInitialized())
             // tools or clients should not limit the sstable formats they support
             storageCompatibilityMode = StorageCompatibilityMode.NONE;
         else if (conf != null && conf.storage_compatibility_mode != null)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`5.1`
	`2`	`+ * Include tools in applyCompatibilityMode to ensure they are not limited in sstable formats they support (CASSANDRA-21196)`
`2`	`3`	`* Harden the possible range of values for max dictionary size and max total sample size for dictionary training (CASSANDRA-21194)`
`3`	`4`	`* Implement a guardrail ensuring that minimum training frequency parameter is provided in ZstdDictionaryCompressor (CASSANDRA-21192)`
`4`	`5`	`* Replace manual referencing with ColumnFamilyStore.selectAndReference when training a dictionary (CASSANDRA-21188)`
Original file line number	Diff line number	Diff line change
`@@ -1896,7 +1896,7 @@ private static void validateSSTableFormatFactories(Iterable<SSTableFormat.Factor`
`1896`	`1896`
`1897`	`1897`	`private static void applyCompatibilityMode()`
`1898`	`1898`	`{`
`1899`		`- if (isClientInitialized())`
	`1899`	`+ if (isClientInitialized() \|\| isToolInitialized())`
`1900`	`1900`	`// tools or clients should not limit the sstable formats they support`
`1901`	`1901`	`storageCompatibilityMode = StorageCompatibilityMode.NONE;`
`1902`	`1902`	`else if (conf != null && conf.storage_compatibility_mode != null)`