Remove deprecated native_transport_min_threads option
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/741aa31a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/741aa31a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/741aa31a Branch: refs/heads/cassandra-2.0 Commit: 741aa31a08976093b8adcfe0881232220d63af94 Parents: a88c6db Author: Sylvain Lebresne <[email protected]> Authored: Mon Aug 26 17:45:01 2013 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Mon Aug 26 17:45:53 2013 +0200 ---------------------------------------------------------------------- NEWS.txt | 2 ++ conf/cassandra.yaml | 10 ++++------ src/java/org/apache/cassandra/config/Config.java | 1 - .../org/apache/cassandra/config/DatabaseDescriptor.java | 5 ----- 4 files changed, 6 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/741aa31a/NEWS.txt ---------------------------------------------------------------------- diff --git a/NEWS.txt b/NEWS.txt index cd8c880..f896671 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -51,6 +51,8 @@ Upgrading have new value. When upgrading, Cassandra will pick up the value defined in cassanda.yaml as the default for existing ColumnFamilies, until you explicitly set the value for those. + - The deprecated native_transport_min_threads option has been removed in + Cassandra.yaml. Operations ---------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/741aa31a/conf/cassandra.yaml ---------------------------------------------------------------------- diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml index bf6e40d..aef3e60 100644 --- a/conf/cassandra.yaml +++ b/conf/cassandra.yaml @@ -302,12 +302,10 @@ listen_address: localhost start_native_transport: true # port for the CQL native transport to listen for clients on native_transport_port: 9042 -# The minimum and maximum threads for handling requests when the native -# transport is used. They are similar to rpc_min_threads and rpc_max_threads, -# though the defaults differ slightly. -# NOTE: native_transport_min_threads is now deprecated and ignored (but kept -# in the 1.2.x series for compatibility sake). -# native_transport_min_threads: 16 +# The maximum threads for handling requests when the native transport is used. +# This is similar to rpc_max_threads though the default differs slightly (and +# there is no native_transport_min_threads, idle threads will always be stopped +# after 30 seconds). # native_transport_max_threads: 128 # Whether to start the thrift rpc server. http://git-wip-us.apache.org/repos/asf/cassandra/blob/741aa31a/src/java/org/apache/cassandra/config/Config.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java index 76bfde3..61d1d51 100644 --- a/src/java/org/apache/cassandra/config/Config.java +++ b/src/java/org/apache/cassandra/config/Config.java @@ -95,7 +95,6 @@ public class Config public Boolean start_native_transport = false; public Integer native_transport_port = 9042; - public Integer native_transport_min_threads = 16; public Integer native_transport_max_threads = 128; @Deprecated http://git-wip-us.apache.org/repos/asf/cassandra/blob/741aa31a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java index f1e065f..a9b0d41 100644 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@ -971,11 +971,6 @@ public class DatabaseDescriptor return Integer.parseInt(System.getProperty("cassandra.native_transport_port", conf.native_transport_port.toString())); } - public static Integer getNativeTransportMinThreads() - { - return conf.native_transport_min_threads; - } - public static Integer getNativeTransportMaxThreads() { return conf.native_transport_max_threads;
