Merge branch 'cassandra-6.0' into CASSANDRA-21134-direct-compaction-writes

Author: samueldlightfoot

.build/checkstyle.xml

@@ -58,14 +58,14 @@
     </module>
 
     <module name="SuppressWithNearbyCommentFilter">
-      <property name="commentFormat" value="checkstyle: permit this invocation"/>
-      <property name="idFormat" value="blockPathToFile"/>
-      <property name="influenceFormat" value="0"/>
+       <property name="commentFormat" value="checkstyle: permit this invocation"/>
+       <property name="idFormat" value="blockInstantNow|blockPathToFile|blockToCases"/>
+       <property name="influenceFormat" value="0"/>
     </module>
 
     <module name="SuppressWithNearbyCommentFilter">
       <property name="commentFormat" value="checkstyle: permit this invocation"/>
-      <property name="idFormat" value="blockToCases"/>
+      <property name="idFormat" value="blockInstantNow"/>
       <property name="influenceFormat" value="0"/>
     </module>
 

.build/git/git-hooks/post-checkout/100-update-submodules.sh

@@ -31,11 +31,18 @@ _main() {
   root_dir="$(git rev-parse --show-toplevel)"
   cd "$root_dir"
 
-  if [[ ! -e .gitmodules ]]; then
+  if ! git ls-files --error-unmatch .gitmodules &>/dev/null; then
     # nothing to see here, look away!
     return 0
   fi
-  git submodule update --init --recursive
+
+  local extra_args=""
+  if [[ -n "${BUILD_OFFLINE:-}" ]]; then
+    echo "BUILD_OFFLINE is defined; using --no-fetch for submodule updates (local SHAs only)."
+    echo "If your submodules are not already available locally, expect this to error out."
+    extra_args="--no-fetch"
+  fi
+  git submodule update --init --recursive ${extra_args:-}
 }
 
 _main "$@"

.build/git/git-hooks/pre-commit/100-verify-submodules-pushed.sh

@@ -60,7 +60,7 @@ _main() {
   root_dir="$(git rev-parse --show-toplevel)"
   cd "$root_dir"
 
-  [[ ! -e .gitmodules ]] && return 0
+  git ls-files --error-unmatch .gitmodules &>/dev/null || return 0
   local enabled=$(git config --bool cassandra.pre-commit.verify-submodules.enabled || echo true)
   [ "$enabled" == "false" ] && return 0
   local submodules=( $(git config --file .gitmodules --get-regexp path | awk '{ print $2 }') )

CHANGES.txt

@@ -1,4 +1,8 @@
 6.0-alpha2
+ * Add an offline cluster metadata tool (CASSANDRA-19151)
+ * Accord: Tail Latency Improvements (CASSANDRA-21361)
+ * Artificial Latency Injection (CASSANDRA-17024)
+ * Accord: Clean Shutdown/Restart, Rebootstrap, et al (CASSANDRA-21355)
  * Reduce memory allocations in SelectStatement.getQuery (CASSANDRA-21351)
  * Avoid allocation by getFunctions in SelectStatement.authorize (CASSANDRA-21347)
  * Avoid unit conversion in DatabaseDescriptor.getMaxValueSize() for every deserializing Cell (CASSANDRA-21295)
@@ -21,6 +25,7 @@
  * Fix a removed TTLed row re-appearance in a materialized view after a cursor compaction (CASSANDRA-21152)
  * Rework ZSTD dictionary compression logic to create a trainer per training (CASSANDRA-21209)
 Merged from 5.0:
+ * Use estimated compressed size for tables to check if there is enough free space for a compaction (CASSANDRA-21245)
  * Fix failing select on system_views.settings for non-string keys (CASSANDRA-21348)
  * Ensure SAI sends range tombstones to the coordinator for queries on static columns (CASSANDRA-21332)
 Merged from 4.1:

modules/accord

@@ -330,6 +330,7 @@ else if (cacheType == CacheService.CacheType.COUNTER_CACHE)
                                                   type,
                                                   0,
                                                   keysEstimate,
+                                                  keysEstimate,
                                                   Unit.KEYS,
                                                   nextTimeUUID(),
                                                   getCacheDataPath(CURRENT_VERSION).toPath().toString());
@@ -344,7 +345,8 @@ public CompactionInfo getCompactionInfo()
         {
             // keyset can change in size, thus total can too
             // TODO need to check for this one... was: info.forProgress(keysWritten, Math.max(keysWritten, keys.size()));
-            return info.forProgress(keysWritten, Math.max(keysWritten, keysEstimate));
+            long totalKeys = Math.max(keysWritten, keysEstimate);
+            return info.forProgress(keysWritten, totalKeys, totalKeys);
         }
 
         public void saveCache()

src/java/org/apache/cassandra/cache/AutoSavingCache.java

@@ -33,7 +33,7 @@
  */
 public class ExecutorLocals implements WithResources, Closeable
 {
-    private static final ExecutorLocals none = new ExecutorLocals(null, null);
+    private static final ExecutorLocals none = new ExecutorLocals(null, null, false);
     private static final FastThreadLocal<ExecutorLocals> locals = new FastThreadLocal<ExecutorLocals>()
     {
         @Override
@@ -45,20 +45,23 @@ protected ExecutorLocals initialValue()
 
     public static class Impl
     {
-        protected static void set(TraceState traceState, ClientWarn.State clientWarnState)
+        @SuppressWarnings("resource")
+        protected static void set(TraceState traceState, ClientWarn.State clientWarnState, boolean eligibleForArtificialLatency)
         {
-            if (traceState == null && clientWarnState == null) locals.set(none);
-            else locals.set(new ExecutorLocals(traceState, clientWarnState));
+            if (traceState == null && clientWarnState == null && !eligibleForArtificialLatency) locals.set(none);
+            else locals.set(new ExecutorLocals(traceState, clientWarnState, eligibleForArtificialLatency));
         }
     }
 
     public final TraceState traceState;
     public final ClientWarn.State clientWarnState;
+    public final boolean eligibleForArtificialLatency;
 
-    protected ExecutorLocals(TraceState traceState, ClientWarn.State clientWarnState)
+    protected ExecutorLocals(TraceState traceState, ClientWarn.State clientWarnState, boolean eligibleForArtificialLatency)
     {
         this.traceState = traceState;
         this.clientWarnState = clientWarnState;
+        this.eligibleForArtificialLatency = eligibleForArtificialLatency;
     }
 
     /**
@@ -82,7 +85,7 @@ public static WithResources propagate()
     public static ExecutorLocals create(TraceState traceState)
     {
         ExecutorLocals current = locals.get();
-        return current.traceState == traceState ? current : new ExecutorLocals(traceState, current.clientWarnState);
+        return current.traceState == traceState ? current : new ExecutorLocals(traceState, current.clientWarnState, current.eligibleForArtificialLatency);
     }
 
     public static void clear()