diff --git a/CHANGES.txt b/CHANGES.txt index d41d293617..937bedf61f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,6 @@ 4.0.3 + * Deprecate otc_coalescing_strategy, otc_coalescing_window_us, otc_coalescing_enough_coalesced_messages, + otc_backlog_expiration_interval_ms (CASSANDRA-17377) * Improve start up processing of Incremental Repair information read from system.repairs (CASSANDRA-17342) 4.0.2 diff --git a/NEWS.txt b/NEWS.txt index 1649ccdf80..8599c36949 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -33,6 +33,18 @@ restore snapshots created with the previous major version using the 'sstableloader' tool. You can upgrade the file format of your snapshots using the provided 'sstableupgrade' tool. +4.0.3 +===== + +New features +------------ + + +Upgrading +--------- + - otc_coalescing_strategy, otc_coalescing_window_us, otc_coalescing_enough_coalesced_messages, + otc_backlog_expiration_interval_ms are deprecated and will be removed at earliest with next major release. + otc_coalescing_strategy is disabled since 3.11. 4.0.2 ===== diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java index 80c8435b32..049c4ccb15 100644 --- a/src/java/org/apache/cassandra/config/Config.java +++ b/src/java/org/apache/cassandra/config/Config.java @@ -369,6 +369,20 @@ public class Config */ public volatile ConsistencyLevel ideal_consistency_level = null; + @Deprecated + public String otc_coalescing_strategy = "DISABLED"; + + @Deprecated + public static final int otc_coalescing_window_us_default = 200; + @Deprecated + public int otc_coalescing_window_us = otc_coalescing_window_us_default; + @Deprecated + public int otc_coalescing_enough_coalesced_messages = 8; + @Deprecated + public static final int otc_backlog_expiration_interval_ms_default = 200; + @Deprecated + public volatile int otc_backlog_expiration_interval_ms = otc_backlog_expiration_interval_ms_default; + public int windows_timer_interval = 0; /**