Merge branch 'cassandra-2.1' into trunk
Conflicts:
src/java/org/apache/cassandra/config/DatabaseDescriptor.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e0d25874
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e0d25874
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e0d25874
Branch: refs/heads/trunk
Commit: e0d25874c40ae56661fc4df3b3bd52a82880b285
Parents: d26bfe9 98eb8ba
Author: Brandon Williams <[email protected]>
Authored: Tue May 12 14:40:25 2015 -0500
Committer: Brandon Williams <[email protected]>
Committed: Tue May 12 14:40:25 2015 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e0d25874/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 68d7e82,803591f..7da9066
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@@ -420,8 -447,9 +420,10 @@@ public class DatabaseDescripto
if (ThriftServer.HSHA.equals(conf.rpc_server_type) &&
conf.rpc_max_threads == Integer.MAX_VALUE)
throw new ConfigurationException("The hsha rpc_server_type is not
compatible with an rpc_max_threads " +
"setting of 'unlimited'. Please
see the comments in cassandra.yaml " +
- "for rpc_server_type and
rpc_max_threads.");
+ "for rpc_server_type and
rpc_max_threads.",
+ false);
+ if (ThriftServer.HSHA.equals(conf.rpc_server_type) &&
conf.rpc_max_threads > (FBUtilities.getAvailableProcessors() * 2 + 1024))
+ logger.warn("rpc_max_threads setting of {} may be too high for
the hsha server and cause unnecessary thread contention, reducing performance",
conf.rpc_max_threads);
/* end point snitch */
if (conf.endpoint_snitch == null)
