cleanup
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2ab0c720 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ab0c720 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2ab0c720 Branch: refs/heads/cassandra-1.2 Commit: 2ab0c720f800292fc705f277b90097f6d0b16f26 Parents: 9f18611 Author: Jonathan Ellis <jbel...@apache.org> Authored: Sun Mar 24 01:39:24 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Sun Mar 24 01:42:02 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/config/Config.java | 4 ++-- .../cassandra/config/DatabaseDescriptor.java | 9 --------- 2 files changed, 2 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ab0c720/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 780eaac..5061042 100644 --- a/src/java/org/apache/cassandra/config/Config.java +++ b/src/java/org/apache/cassandra/config/Config.java @@ -84,8 +84,8 @@ public class Config public Integer rpc_port = 9160; public String rpc_server_type = "sync"; public Boolean rpc_keepalive = true; - public Integer rpc_min_threads = null; - public Integer rpc_max_threads = null; + public Integer rpc_min_threads = 16; + public Integer rpc_max_threads = Integer.MAX_VALUE; public Integer rpc_send_buff_size_in_bytes; public Integer rpc_recv_buff_size_in_bytes; public Integer internode_send_buff_size_in_bytes; http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ab0c720/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 bf793be..31e0b5a 100644 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@ -407,15 +407,6 @@ public class DatabaseDescriptor if (conf.concurrent_compactors <= 0) throw new ConfigurationException("concurrent_compactors should be strictly greater than 0"); - if (conf.compaction_throughput_mb_per_sec == null) - conf.compaction_throughput_mb_per_sec = 16; - - if (conf.rpc_min_threads == null) - conf.rpc_min_threads = 16; - - if (conf.rpc_max_threads == null) - conf.rpc_max_threads = Integer.MAX_VALUE; - /* data file and commit log directories. they get created later, when they're needed. */ if (conf.commitlog_directory != null && conf.data_file_directories != null && conf.saved_caches_directory != null) {
