CNDB-12956: Vector CC Release Issue: Tenant Assignment Failure on Kube AWS 701031671627: The minimum sstable size 1.000GiB cannot be larger than the target size's lower bound 724.077MiB (#1567)

…e AWS 701031671627: The minimum sstable size 1.000GiB cannot be larger
than the target size's lower bound 724.077MiB

Revert "CNDB-10455: Automatically tune compaction for vector tables
(#1265)"

This reverts commit 8305834.

see CNDB-12956

Author: eolivelli

src/java/org/apache/cassandra/config/CassandraRelevantProperties.java

@@ -875,10 +875,10 @@ public enum CassandraRelevantProperties
     UCS_RESERVATIONS_TYPE_OPTION("unified_compaction.reservations_type_option", Reservations.Type.LEVEL_OR_BELOW.name()),
     UCS_RESERVED_THREADS("reserved_threads", "max"),
     UCS_SHARED_STORAGE("unified_compaction.shared_storage", "false"),
-    UCS_SSTABLE_GROWTH("unified_compaction.sstable_growth", "0.333"),
+    UCS_SSTABLE_GROWTH("unified_compaction.sstable_growth", "0.5"),
     UCS_STATIC_SCALING_PARAMETERS("unified_compaction.scaling_parameters", "T4"),
     UCS_SURVIVAL_FACTOR("unified_compaction.survival_factor", "1"),
-    UCS_TARGET_SSTABLE_SIZE("unified_compaction.target_sstable_size", "1GiB"),
+    UCS_TARGET_SSTABLE_SIZE("unified_compaction.target_sstable_size", "5GiB"),
     UCS_VECTOR_BASE_SHARD_COUNT("unified_compaction.vector_base_shard_count", "1"),
     UCS_VECTOR_MIN_SSTABLE_SIZE("unified_compaction.vector_min_sstable_size", "1024MiB"),
     UCS_VECTOR_RESERVED_THREADS("unified_compaction.vector_reserved_threads", "max"),

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

@@ -50,7 +50,6 @@ public class UnifiedCompactionContainer implements CompactionStrategyContainer
     private final CompactionParams metadataParams;
     private final UnifiedCompactionStrategy strategy;
     private final boolean enableAutoCompaction;
-    private final boolean hasVector;
 
     AtomicBoolean enabled;
 
@@ -67,7 +66,6 @@ public class UnifiedCompactionContainer implements CompactionStrategyContainer
         this.strategy = new UnifiedCompactionStrategy(factory, backgroundCompactions, params.options());
         this.enabled = new AtomicBoolean(enabled);
         this.enableAutoCompaction = enableAutoCompaction;
-        this.hasVector = strategy.getController().hasVectorType();
 
         factory.getCompactionLogger().strategyCreated(this.strategy);
 
@@ -144,14 +142,6 @@ public CompactionStrategyContainer reload(@Nonnull CompactionStrategyContainer p
         return create(previous, factory, compactionParams, reason, enableAutoCompaction);
     }
 
-    @Override
-    public boolean shouldReload(CompactionParams params, ReloadReason reason)
-    {
-        return reason != CompactionStrategyContainer.ReloadReason.METADATA_CHANGE
-               || !params.equals(getMetadataCompactionParams())
-               || hasVector != factory.getRealm().metadata().hasVectorType();
-    }
-
     private static CompactionParams createMetadataParams(@Nullable CompactionStrategyContainer previous,
                                                          CompactionParams compactionParams,
                                                          ReloadReason reason)

src/java/org/apache/cassandra/db/compaction/UnifiedCompactionStrategy.md

@@ -463,10 +463,6 @@ the span of the lower-density ones.
 
 UCS accepts these compaction strategy parameters:
 
-* `override_ucs_config_for_vector_tables` Allows different configurations for vector and non-vector tables.  When set
-  to `true`, if a table has a column of `VectorType`, the "vector" parameters will be used instead of the regular
-  parameters. For example, `vector_min_sstable_size` will be used, and `min_sstable_size` will be ignored.   
-  The default value is `false` which disables this feature.
 * `scaling_parameters` A list of per-level scaling parameters, specified as L*f*, T*f*, N, or an integer value
   specifying $w$ directly. If more levels are present than the length of this list, the last value is used for all
   higher levels. Often this will be a single parameter, specifying the behaviour for all levels of the
@@ -481,8 +477,6 @@ UCS accepts these compaction strategy parameters:
   compaction to be promoted to the next level) and a fan factor of 2. This can also be specified as T2 or L2.  
   The default value is T4, matching the default STCS behaviour with threshold 4. To select an equivalent of LCS
   with its default fan factor 10, use L10.
-* `vector_scaling_parameters` A list of per-level scaling parameters used for vector tables when `override_ucs_config_for_vector_tables=true`.   
-  The default value is -8 or L10.
 * `target_sstable_size` The target sstable size $t$, specified as a human-friendly size in bytes (e.g. 100 MiB =
   $100\cdot 2^{20}$ B or (10 MB = 10,000,000 B)). The strategy will split data in shards that aim to produce sstables
   of size between $t / \sqrt 2$ and $t \cdot \sqrt 2$.  
@@ -491,14 +485,10 @@ UCS accepts these compaction strategy parameters:
   Increase this if the memory pressure from the number of sstables in the system becomes too high. Also see
   `sstable_growth` below.  
   The default value is 1 GiB.
-* `vector_target_sstable_size` The target sstable size used for vector tables when `override_ucs_config_for_vector_tables=true`.   
-  The default value is 5GiB.
 * `base_shard_count` The minimum number of shards $b$, used for levels with the smallest density. This gives the
   minimum compaction concurrency for the lowest levels. A low number would result in larger L0 sstables but may limit
   the overall maximum write throughput (as every piece of data has to go through L0). The base shard count only applies after `min_sstable_size` is reached.  
   The default value is 4 for all tables.
-* `vector_base_shard_count` The base shard count used for vector tables when `override_ucs_config_for_vector_tables=true`.   
-  The default value is 1.
 * `sstable_growth` The sstable growth component $\lambda$, applied as a factor in the shard exponent calculation.
   This is a number between 0 and 1 that controls what part of the density growth should apply to individual sstable
   size and what part should increase the number of shards. Using a value of 1 has the effect of fixing the shard
@@ -513,23 +503,17 @@ UCS accepts these compaction strategy parameters:
   two can be further tweaked by increasing $\lambda$ to get fewer but bigger sstables on the top level, and decreasing
   it to favour a higher count of smaller sstables.  
   The default value is 0.333 meaning the sstable size grows with the square root of the growth of the shard count.
-* `vector_sstable_growth` The sstable growth component used for vector tables when `override_ucs_config_for_vector_tables=true`.   
-  The default value is 1 which means the shard count will be fixed to the base value.
 * `min_sstable_size` The minimum sstable size $m$, applicable when the base shard count will result is sstables
   that are considered too small. If set, the strategy will split the space into fewer than the base count shards, to
   make the estimated sstables size at least as large as this value. A value of 0 disables this feature. A value of `auto` sets the minimum sstable size to the size
   of sstables resulting from flushes. The default value is 100MiB.
-* `vector_min_sstable_size` The minimum sstable size used for vector tables when `override_ucs_config_for_vector_tables=true`.   
-  The default value is 1024MiB.
 * `reserved_threads` Specifies the number of threads to reserve per level. Any remaining threads will take
   work according to the prioritization mechanism (i.e. higher overlap first). Higher reservations mean better
   responsiveness of the compaction strategy to new work, or smoother performance, at the expense of reducing the
   overall utilization of compaction threads. Higher values work best with high `concurrent_compactors` values.  
   The default value is `max`, which spreads all threads as close to evenly between levels as possible. It is recommended
   to keep this option and the next at their defaults, which should offer a good balance between responsiveness and
   thread utilization.
-* `vector_reserved_threads` Specifies the number of threads to reserve per level for vector tables when `override_ucs_config_for_vector_tables=true`.   
-  The default value is `max`.
 * `reservations_type` Specifies whether reservations can be used by lower levels. If set to `per_level`, the
   reservations are only used by the specific level. If set to `level_or_below`, the reservations can be used by this
   level as well as any one below it.  

src/java/org/apache/cassandra/db/compaction/unified/AdaptiveController.java

@@ -122,7 +122,6 @@ public AdaptiveController(MonotonicClock clock,
                               Reservations.Type reservationsType,
                               Overlaps.InclusionMethod overlapInclusionMethod,
                               boolean parallelizeOutputShards,
-                              boolean hasVectorType,
                               int intervalSec,
                               int minScalingParameter,
                               int maxScalingParameter,
@@ -150,8 +149,7 @@ public AdaptiveController(MonotonicClock clock,
               reservedThreadsPerLevel,
               reservationsType,
               overlapInclusionMethod,
-              parallelizeOutputShards,
-              hasVectorType);
+              parallelizeOutputShards);
 
         this.scalingParameters = scalingParameters;
         this.previousScalingParameters = previousScalingParameters;
@@ -180,9 +178,8 @@ static Controller fromOptions(Environment env,
                                   double sstableGrowthModifier,
                                   int reservedThreadsPerLevel,
                                   Reservations.Type reservationsType,
-                                  Overlaps.InclusionMethod overlapInclusionMethod,
                                   boolean parallelizeOutputShards,
-                                  boolean hasVectorType,
+                                  Overlaps.InclusionMethod overlapInclusionMethod,
                                   String keyspaceName,
                                   String tableName,
                                   Map<String, String> options)
@@ -282,7 +279,6 @@ else if (staticScalingFactors != null)
                                       reservationsType,
                                       overlapInclusionMethod,
                                       parallelizeOutputShards,
-                                      hasVectorType,
                                       intervalSec,
                                       minScalingParameter,
                                       maxScalingParameter,
@@ -330,9 +326,6 @@ else if (staticScalingFactors != null)
             parseScalingParameters(staticScalingFactors);
         else if (staticScalingParameters != null)
             parseScalingParameters(staticScalingParameters);
-        String vectorScalingParameters = options.remove(VECTOR_SCALING_PARAMETERS_OPTION);
-        if (vectorScalingParameters != null)
-            throw new ConfigurationException(String.format("%s option is not supported with Adaptive UCS", VECTOR_SCALING_PARAMETERS_OPTION));
         s = options.remove(MIN_SCALING_PARAMETER);
         if (s != null)
             minScalingParameter = Integer.parseInt(s);