Merge branch 'cassandra-5.0' into trunk

CHANGES.txt

@@ -3,6 +3,7 @@
  * Add the ability to disable bulk loading of SSTables (CASSANDRA-18781)
  * Clean up obsolete functions and simplify cql_version handling in cqlsh (CASSANDRA-18787)
 Merged from 5.0:
+ * Set default disk_access_mode to mmap_index_only (CASSANDRA-19021)
  * Exclude net.java.dev.jna:jna dependency from dependencies of org.caffinitas.ohc:ohc-core (CASSANDRA-18992)
  * Add UCS sstable_growth and min_sstable_size options (CASSANDRA-18945)
  * Make cqlsh's min required Python version 3.7+ instead of 3.6+ (CASSANDRA-18960)

NEWS.txt

@@ -205,6 +205,8 @@ New features
 
 Upgrading
 ---------
+    - Default disk_access_mode value changed from "auto" to "mmap_index_only". Override this setting with "disk_access_mode: auto" on
+      cassandra.yaml to keep the previous default. See CASSANDRA-19021 for details.
     - The minimumn Python version to run cqlsh has been bumped from 3.6 to 3.7. Python 3.6 is past its end-of-life, and
       3.7 is the minimum version supported by the Python driver.
     - Java 8 has been removed. Lowest supported version is Java 11.

conf/cassandra.yaml

@@ -369,6 +369,23 @@ cdc_enabled: false
 # $CASSANDRA_HOME/data/cdc_raw.
 # cdc_raw_directory: /var/lib/cassandra/cdc_raw
 
+# Policy for accessing disk:
+#
+# auto
+#   Enable mmap on both data and index files on a 64-bit JVM.
+#
+# standard
+#   Disable mmap entirely.
+#
+# mmap
+#   Map index and data files. mmap can cause excessive paging if all actively read SSTables do not fit into RAM.
+#
+# mmap_index_only
+#   Similar to mmap but maps only index files. Using this setting might also help if you observe high number of page
+#   faults or steals along with increased latencies. This setting is default.
+#
+# disk_access_mode: mmap_index_only
+
 # Policy for data disk failures:
 #
 # die

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

@@ -117,7 +117,7 @@ public class Config
     public volatile boolean force_new_prepared_statement_behaviour = false;
 
     public ParameterizedClass seed_provider;
-    public DiskAccessMode disk_access_mode = DiskAccessMode.auto;
+    public DiskAccessMode disk_access_mode = DiskAccessMode.mmap_index_only;
 
     public DiskFailurePolicy disk_failure_policy = DiskFailurePolicy.ignore;
     public CommitFailurePolicy commit_failure_policy = CommitFailurePolicy.stop;

test/conf/cassandra-mtls-backward-compatibility.yaml

@@ -37,7 +37,7 @@ column_index_size: 4KiB
 saved_caches_directory: build/test/cassandra/saved_caches
 data_file_directories:
   - build/test/cassandra/data
-disk_access_mode: mmap
+disk_access_mode: mmap_index_only
 seed_provider:
   - class_name: org.apache.cassandra.locator.SimpleSeedProvider
     parameters:

test/conf/cassandra-mtls.yaml

@@ -37,7 +37,7 @@ column_index_size: 4KiB
 saved_caches_directory: build/test/cassandra/saved_caches
 data_file_directories:
   - build/test/cassandra/data
-disk_access_mode: mmap
+disk_access_mode: mmap_index_only
 seed_provider:
   - class_name: org.apache.cassandra.locator.SimpleSeedProvider
     parameters:

test/conf/cassandra-murmur.yaml

@@ -19,7 +19,7 @@ column_index_size: 4KiB
 saved_caches_directory: build/test/cassandra/saved_caches
 data_file_directories:
     - build/test/cassandra/data
-disk_access_mode: mmap
+disk_access_mode: mmap_index_only
 seed_provider:
     - class_name: org.apache.cassandra.locator.SimpleSeedProvider
       parameters:

test/conf/cassandra-old.yaml

@@ -23,7 +23,7 @@ column_index_size: 4KiB
 saved_caches_directory: build/test/cassandra/saved_caches
 data_file_directories:
     - build/test/cassandra/data
-disk_access_mode: mmap
+disk_access_mode: mmap_index_only
 seed_provider:
     - class_name: org.apache.cassandra.locator.SimpleSeedProvider
       parameters:

test/conf/cassandra-pem-jks-sslcontextfactory.yaml

@@ -41,7 +41,7 @@ column_index_size: 4KiB
 saved_caches_directory: build/test/cassandra/saved_caches
 data_file_directories:
     - build/test/cassandra/data
-disk_access_mode: mmap
+disk_access_mode: mmap_index_only
 seed_provider:
     - class_name: org.apache.cassandra.locator.SimpleSeedProvider
       parameters:

test/conf/cassandra-pem-sslcontextfactory-invalidconfiguration.yaml

@@ -41,7 +41,7 @@ column_index_size: 4KiB
 saved_caches_directory: build/test/cassandra/saved_caches
 data_file_directories:
     - build/test/cassandra/data
-disk_access_mode: mmap
+disk_access_mode: mmap_index_only
 seed_provider:
     - class_name: org.apache.cassandra.locator.SimpleSeedProvider
       parameters:

test/conf/cassandra-pem-sslcontextfactory-mismatching-passwords.yaml

@@ -41,7 +41,7 @@ column_index_size: 4KiB
 saved_caches_directory: build/test/cassandra/saved_caches
 data_file_directories:
     - build/test/cassandra/data
-disk_access_mode: mmap
+disk_access_mode: mmap_index_only
 seed_provider:
     - class_name: org.apache.cassandra.locator.SimpleSeedProvider
       parameters:

test/conf/cassandra-pem-sslcontextfactory-unencryptedkeys.yaml

@@ -41,7 +41,7 @@ column_index_size: 4KiB
 saved_caches_directory: build/test/cassandra/saved_caches
 data_file_directories:
     - build/test/cassandra/data
-disk_access_mode: mmap
+disk_access_mode: mmap_index_only
 seed_provider:
     - class_name: org.apache.cassandra.locator.SimpleSeedProvider
       parameters:

test/conf/cassandra-pem-sslcontextfactory.yaml

@@ -41,7 +41,7 @@ column_index_size: 4KiB
 saved_caches_directory: build/test/cassandra/saved_caches
 data_file_directories:
     - build/test/cassandra/data
-disk_access_mode: mmap
+disk_access_mode: mmap_index_only
 seed_provider:
     - class_name: org.apache.cassandra.locator.SimpleSeedProvider
       parameters:

test/conf/cassandra-seeds.yaml

@@ -20,7 +20,7 @@ column_index_size: 4KiB
 saved_caches_directory: build/test/cassandra/saved_caches
 data_file_directories:
     - build/test/cassandra/data
-disk_access_mode: mmap
+disk_access_mode: mmap_index_only
 seed_provider:
     - class_name: org.apache.cassandra.locator.SimpleSeedProvider
       parameters:

test/conf/cassandra-sslcontextfactory-invalidconfiguration.yaml

@@ -41,7 +41,7 @@ column_index_size: 4KiB
 saved_caches_directory: build/test/cassandra/saved_caches
 data_file_directories:
     - build/test/cassandra/data
-disk_access_mode: mmap
+disk_access_mode: mmap_index_only
 seed_provider:
     - class_name: org.apache.cassandra.locator.SimpleSeedProvider
       parameters:

test/conf/cassandra-sslcontextfactory.yaml

@@ -41,7 +41,7 @@ column_index_size: 4KiB
 saved_caches_directory: build/test/cassandra/saved_caches
 data_file_directories:
     - build/test/cassandra/data
-disk_access_mode: mmap
+disk_access_mode: mmap_index_only
 seed_provider:
     - class_name: org.apache.cassandra.locator.SimpleSeedProvider
       parameters:

test/conf/cassandra.yaml

@@ -23,7 +23,7 @@ column_index_size: 4KiB
 saved_caches_directory: build/test/cassandra/saved_caches
 data_file_directories:
     - build/test/cassandra/data
-disk_access_mode: mmap
+disk_access_mode: mmap_index_only
 seed_provider:
     - class_name: org.apache.cassandra.locator.SimpleSeedProvider
       parameters:

test/conf/unit-test-conf/test-native-port.yaml

@@ -23,7 +23,7 @@ column_index_size: 4KiB
 saved_caches_directory: build/test/cassandra/saved_caches
 data_file_directories:
 - build/test/cassandra/data
-disk_access_mode: mmap
+disk_access_mode: mmap_index_only
 seed_provider:
 - class_name: org.apache.cassandra.locator.SimpleSeedProvider
   parameters: