merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8e825905 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8e825905 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8e825905 Branch: refs/heads/cassandra-2.0 Commit: 8e82590506f0747780ed973db0b6afbd481a7c23 Parents: f15681b 3f66fbf Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Nov 26 15:18:53 2013 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Nov 26 15:18:53 2013 -0600 ---------------------------------------------------------------------- conf/cassandra-env.sh | 2 -- 1 file changed, 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8e825905/conf/cassandra-env.sh ---------------------------------------------------------------------- diff --cc conf/cassandra-env.sh index e8aa3a4,b5aea38..e229297 --- a/conf/cassandra-env.sh +++ b/conf/cassandra-env.sh @@@ -192,11 -184,15 +192,9 @@@ f startswith() { [ "${1#$2}" != "$1" ]; } -if [ "`uname`" = "Linux" ] ; then - # reduce the per-thread stack size to minimize the impact of Thrift - # thread-per-client. (Best practice is for client connections to - # be pooled anyway.) Only do so on Linux where it is known to be - # supported. - # u34 and greater need 180k - JVM_OPTS="$JVM_OPTS -Xss256k" -fi +# Per-thread stack size. +JVM_OPTS="$JVM_OPTS -Xss256k" - echo "xss = $JVM_OPTS" - # GC tuning options JVM_OPTS="$JVM_OPTS -XX:+UseParNewGC" JVM_OPTS="$JVM_OPTS -XX:+UseConcMarkSweepGC"