You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2015/05/12 21:40:31 UTC
[1/6] cassandra git commit: Warn when rpc_max_threads is set very high
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 bed42c210 -> 33cf701d1
refs/heads/cassandra-2.1 19540f011 -> 98eb8ba52
refs/heads/trunk d26bfe9a4 -> e0d25874c
Warn when rpc_max_threads is set very high
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-9364
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/33cf701d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/33cf701d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/33cf701d
Branch: refs/heads/cassandra-2.0
Commit: 33cf701d1d6b8112b66d02416224bb782e48b287
Parents: bed42c2
Author: Brandon Williams <br...@apache.org>
Authored: Tue May 12 14:38:02 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue May 12 14:38:02 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/33cf701d/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 b3b10c1..3c846f3 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -339,6 +339,8 @@ public class DatabaseDescriptor
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.");
+ 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)
[2/6] cassandra git commit: Warn when rpc_max_threads is set very high
Posted by br...@apache.org.
Warn when rpc_max_threads is set very high
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-9364
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/33cf701d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/33cf701d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/33cf701d
Branch: refs/heads/cassandra-2.1
Commit: 33cf701d1d6b8112b66d02416224bb782e48b287
Parents: bed42c2
Author: Brandon Williams <br...@apache.org>
Authored: Tue May 12 14:38:02 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue May 12 14:38:02 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/33cf701d/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 b3b10c1..3c846f3 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -339,6 +339,8 @@ public class DatabaseDescriptor
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.");
+ 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)
[5/6] cassandra git commit: Merge branch 'cassandra-2.0' into
cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/98eb8ba5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/98eb8ba5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/98eb8ba5
Branch: refs/heads/cassandra-2.1
Commit: 98eb8ba52d2210938b575b5a445164835c74dca8
Parents: 19540f0 33cf701
Author: Brandon Williams <br...@apache.org>
Authored: Tue May 12 14:39:49 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue May 12 14:39:49 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/98eb8ba5/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
[6/6] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@apache.org.
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 <br...@apache.org>
Authored: Tue May 12 14:40:25 2015 -0500
Committer: Brandon Williams <br...@apache.org>
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)
[4/6] cassandra git commit: Merge branch 'cassandra-2.0' into
cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/98eb8ba5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/98eb8ba5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/98eb8ba5
Branch: refs/heads/trunk
Commit: 98eb8ba52d2210938b575b5a445164835c74dca8
Parents: 19540f0 33cf701
Author: Brandon Williams <br...@apache.org>
Authored: Tue May 12 14:39:49 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue May 12 14:39:49 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/98eb8ba5/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
[3/6] cassandra git commit: Warn when rpc_max_threads is set very high
Posted by br...@apache.org.
Warn when rpc_max_threads is set very high
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-9364
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/33cf701d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/33cf701d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/33cf701d
Branch: refs/heads/trunk
Commit: 33cf701d1d6b8112b66d02416224bb782e48b287
Parents: bed42c2
Author: Brandon Williams <br...@apache.org>
Authored: Tue May 12 14:38:02 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue May 12 14:38:02 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/33cf701d/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 b3b10c1..3c846f3 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -339,6 +339,8 @@ public class DatabaseDescriptor
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.");
+ 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)