diff --git a/CHANGES.txt b/CHANGES.txt index ffaeeaa61e..f3bcf42bbe 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 5.0-beta2 + * Disable chronicle analytics (CASSANDRA-19656) * Replace Stream iteration with for-loop for StorageProxy::updateCoordinatorWriteLatencyTableMetric (CASSANDRA-19676) * Enforce metric naming contract if scope is used in a metric name (CASSANDRA-19619) * Avoid reading of the same IndexInfo from disk many times for a large partition (CASSANDRA-19557) diff --git a/conf/jvm-server.options b/conf/jvm-server.options index c9a9336683..343da4f543 100644 --- a/conf/jvm-server.options +++ b/conf/jvm-server.options @@ -141,6 +141,9 @@ # comment out this entry to enable IPv6 support). -Djava.net.preferIPv4Stack=true +# Disable chronicle analytics. See CASSANDRA-19656 +-Dchronicle.analytics.disable=true + ### Debug options # uncomment to enable flight recorder diff --git a/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java b/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java index 336f68838f..968feae396 100644 --- a/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java +++ b/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java @@ -101,6 +101,7 @@ public enum CassandraRelevantProperties CASSANDRA_VERSION("cassandra.version"), /** default heartbeating period is 1 minute */ CHECK_DATA_RESURRECTION_HEARTBEAT_PERIOD("check_data_resurrection_heartbeat_period_milli", "60000"), + CHRONICLE_ANALYTICS_DISABLE("chronicle.analytics.disable"), CHRONICLE_ANNOUNCER_DISABLE("chronicle.announcer.disable"), CLOCK_GLOBAL("cassandra.clock"), CLOCK_MONOTONIC_APPROX("cassandra.monotonic_clock.approx"), diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java index 95eb7aa3c7..af54d32905 100644 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@ -113,6 +113,7 @@ import static org.apache.cassandra.config.CassandraRelevantProperties.ALLOCATE_T import static org.apache.cassandra.config.CassandraRelevantProperties.ALLOW_UNLIMITED_CONCURRENT_VALIDATIONS; import static org.apache.cassandra.config.CassandraRelevantProperties.AUTO_BOOTSTRAP; import static org.apache.cassandra.config.CassandraRelevantProperties.CONFIG_LOADER; +import static org.apache.cassandra.config.CassandraRelevantProperties.CHRONICLE_ANALYTICS_DISABLE; import static org.apache.cassandra.config.CassandraRelevantProperties.DISABLE_STCS_IN_L0; import static org.apache.cassandra.config.CassandraRelevantProperties.INITIAL_TOKEN; import static org.apache.cassandra.config.CassandraRelevantProperties.IO_NETTY_TRANSPORT_ESTIMATE_SIZE_ON_SUBMIT; @@ -144,6 +145,7 @@ public class DatabaseDescriptor { static { + CHRONICLE_ANALYTICS_DISABLE.setBoolean(true); // This static block covers most usages FBUtilities.preventIllegalAccessWarnings(); IO_NETTY_TRANSPORT_ESTIMATE_SIZE_ON_SUBMIT.setBoolean(false);