diff --git a/CHANGES.txt b/CHANGES.txt index 12848afcc1..7cc49c3468 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -59,6 +59,7 @@ * Add a system property to set hostId if not yet initialized (CASSANDRA-14582) * GossiperTest.testHasVersion3Nodes didn't take into account trunk version changes, fixed to rely on latest version (CASSANDRA-16651) Merged from 4.0: + * Remove unused configuration parameters from cassandra.yaml (CASSANDRA-17132) * Queries performed with NODE_LOCAL consistency level do not update request metrics (CASSANDRA-17052) * Fix multiple full sources can be select unexpectedly for bootstrap streaming (CASSANDRA-16945) * Fix cassandra.yaml formatting of parameters (CASSANDRA-17131) diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml index 3e0a1a6022..35faf240cd 100644 --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@ -1018,9 +1018,6 @@ request_timeout_in_ms: 10000 # The default is 5 minutes. Increase it or set it to 0 in order to increase the timeout. # internode_streaming_tcp_user_timeout_in_ms: 300000 -# The maximum continuous period a connection may be unwritable in application space -# internode_application_timeout_in_ms: 30000 - # Global, per-endpoint and per-connection limits imposed on messages queued for delivery to other nodes # and waiting to be processed on arrival from other nodes in the cluster. These limits are applied to the on-wire # size of the message being sent or received. @@ -1438,42 +1435,6 @@ compaction_tombstone_warning_threshold: 100000 # Suggested value for use in production: 2 or higher # minimum_keyspace_rf: 0 -# Coalescing Strategies # -# Coalescing multiples messages turns out to significantly boost message processing throughput (think doubling or more). -# On bare metal, the floor for packet processing throughput is high enough that many applications won't notice, but in -# virtualized environments, the point at which an application can be bound by network packet processing can be -# surprisingly low compared to the throughput of task processing that is possible inside a VM. It's not that bare metal -# doesn't benefit from coalescing messages, it's that the number of packets a bare metal network interface can process -# is sufficient for many applications such that no load starvation is experienced even without coalescing. -# There are other benefits to coalescing network messages that are harder to isolate with a simple metric like messages -# per second. By coalescing multiple tasks together, a network thread can process multiple messages for the cost of one -# trip to read from a socket, and all the task submission work can be done at the same time reducing context switching -# and increasing cache friendliness of network message processing. -# See CASSANDRA-8692 for details. - -# Strategy to use for coalescing messages in OutboundTcpConnection. -# Can be fixed, movingaverage, timehorizon, disabled (default). -# You can also specify a subclass of CoalescingStrategies.CoalescingStrategy by name. -# otc_coalescing_strategy: DISABLED - -# How many microseconds to wait for coalescing. For fixed strategy this is the amount of time after the first -# message is received before it will be sent with any accompanying messages. For moving average this is the -# maximum amount of time that will be waited as well as the interval at which messages must arrive on average -# for coalescing to be enabled. -# otc_coalescing_window_us: 200 - -# Do not try to coalesce messages if we already got that many messages. This should be more than 2 and less than 128. -# otc_coalescing_enough_coalesced_messages: 8 - -# How many milliseconds to wait between two expiration runs on the backlog (queue) of the OutboundTcpConnection. -# Expiration is done if messages are piling up in the backlog. Droppable messages are expired to free the memory -# taken by expired messages. The interval should be between 0 and 1000, and in most installations the default value -# will be appropriate. A smaller value could potentially expire messages slightly sooner at the expense of more CPU -# time and queue contention while iterating the backlog of messages. -# An interval of 0 disables any wait time, which is the behavior of former Cassandra versions. -# -# otc_backlog_expiration_interval_ms: 200 - # Track a metric per keyspace indicating whether replication achieved the ideal consistency # level for writes without timing out. This is different from the consistency level requested by # each write which may be lower in order to facilitate availability. diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java index e043c0164f..f5ce10277c 100644 --- a/src/java/org/apache/cassandra/config/Config.java +++ b/src/java/org/apache/cassandra/config/Config.java @@ -385,24 +385,6 @@ public class Config */ public volatile ConsistencyLevel ideal_consistency_level = null; - /* - * Strategy to use for coalescing messages in {@link OutboundConnections}. - * Can be fixed, movingaverage, timehorizon, disabled. Setting is case and leading/trailing - * whitespace insensitive. You can also specify a subclass of - * {@link org.apache.cassandra.utils.CoalescingStrategies.CoalescingStrategy} by name. - */ - public String otc_coalescing_strategy = "DISABLED"; - - /* - * How many microseconds to wait for coalescing. For fixed strategy this is the amount of time after the first - * message is received before it will be sent with any accompanying messages. For moving average this is the - * maximum amount of time that will be waited as well as the interval at which messages must arrive on average - * for coalescing to be enabled. - */ - public static final int otc_coalescing_window_us_default = 200; - public int otc_coalescing_window_us = otc_coalescing_window_us_default; - public int otc_coalescing_enough_coalesced_messages = 8; - public int windows_timer_interval = 0; /** diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java index 8633277566..dbd9e588b7 100644 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@ -786,12 +786,6 @@ public class DatabaseDescriptor break; } - if (conf.otc_coalescing_enough_coalesced_messages > 128) - throw new ConfigurationException("otc_coalescing_enough_coalesced_messages must be smaller than 128", false); - - if (conf.otc_coalescing_enough_coalesced_messages <= 0) - throw new ConfigurationException("otc_coalescing_enough_coalesced_messages must be positive", false); - if (conf.server_encryption_options != null) { conf.server_encryption_options.applyConfig();