Merge branch 'cassandra-5.0' into trunk

Author: smiklosovic

CHANGES.txt

@@ -357,6 +357,7 @@ Merged from 4.1:
  * Enforce CQL message size limit on multiframe messages (CASSANDRA-20052)
  * Fix race condition in DecayingEstimatedHistogramReservoir during rescale (CASSANDRA-19365)
 Merged from 4.0:
+ * Backport fix to nodetool gcstats output for direct memory (CASSANDRA-21037)
  * ArrayIndexOutOfBoundsException with repaired data tracking and counters (CASSANDRA-20871)
  * Fix cleanup of old incremental repair sessions in case of owned token range changes or a table deleting (CASSANDRA-20877)
  * Fix memory leak in BufferPoolAllocator when a capacity needs to be extended (CASSANDRA-20753)

src/java/org/apache/cassandra/service/GCInspector.java

@@ -67,25 +67,30 @@ public class GCInspector implements NotificationListener, GCInspectorMXBean
 
     static
     {
-        Field totalTempField = null;
-        Field maxTempField = null;
-        Field reservedTempField = null;
+        Class<?> bitsClass = null;
+
         try
         {
-            Class<?> bitsClass = Class.forName("java.nio.Bits");
-            totalTempField = getField(bitsClass, "TOTAL_CAPACITY");
-            // Returns the maximum amount of allocatable direct buffer memory.
-            maxTempField = getField(bitsClass, "MAX_MEMORY");
-            reservedTempField = getField(bitsClass, "RESERVED_MEMORY");
+            bitsClass = Class.forName("java.nio.Bits");
         }
         catch (Throwable t)
         {
             logger.debug("Error accessing field of java.nio.Bits", t);
-            //Don't care, will just return the dummy value -1 if we can't get at the field in this JVM
         }
-        BITS_TOTAL_CAPACITY = totalTempField;
-        BITS_MAX = maxTempField;
-        BITS_RESERVED = reservedTempField;
+
+        if (bitsClass != null)
+        {
+            BITS_TOTAL_CAPACITY = getField(bitsClass, "TOTAL_CAPACITY");
+            // Returns the maximum amount of allocatable direct buffer memory.
+            BITS_MAX = getField(bitsClass, "MAX_MEMORY");
+            BITS_RESERVED = getField(bitsClass, "RESERVED_MEMORY");
+        }
+        else
+        {
+            BITS_TOTAL_CAPACITY = null;
+            BITS_MAX = null;
+            BITS_RESERVED = null;
+        }
     }
 
     static final class State
@@ -397,9 +402,15 @@ private static Field getField(Class<?> clazz, String fieldName)
     }
 
     /**
+     * Retrieves the value of a Field, handling both regular long fields and AtomicLong fields.
+     *
      * From the implementation of java.nio.Bits, we can infer that TOTAL_CAPACITY/RESERVED_MEMORY is AtomicLong
-     * and MAX_MEMORY is long. This method works well with JDK 11/17
-     * */
+     * and MAX_MEMORY is long.
+     *
+     * @param field the Field to retrieve the value from
+     * @param isAtomicLong true if the field is an AtomicLong, false if it's a regular long
+     * @return the field value, or -1 if retrieval fails or field is null.
+     */
     private static long getFieldValue(Field field, boolean isAtomicLong)
     {
         if (field == null) return -1;