Revert "Query the JVM for the minimum stack size." This reverts commit 5bde2a6d5d6bed3ff15ec6caf20524717a130ecb.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bfdfe901 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bfdfe901 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bfdfe901 Branch: refs/heads/trunk Commit: bfdfe9014af788fc9f84ad1283165d9730b999a5 Parents: 5bde2a6 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Jul 20 15:41:57 2012 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Jul 20 15:41:57 2012 -0500 ---------------------------------------------------------------------- conf/cassandra-env.sh | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bfdfe901/conf/cassandra-env.sh ---------------------------------------------------------------------- diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh index 17c2fb8..cef0efb 100644 --- a/conf/cassandra-env.sh +++ b/conf/cassandra-env.sh @@ -151,19 +151,18 @@ if [ "x$CASSANDRA_HEAPDUMP_DIR" != "x" ]; then JVM_OPTS="$JVM_OPTS -XX:HeapDumpPath=$CASSANDRA_HEAPDUMP_DIR/cassandra-`date +%s`-pid$$.hprof" fi -java_version=`"${JAVA:-java}" -version 2>&1 | awk '/version/ {print $3}' | egrep -o '[0-9]+\.[0-9]+'` if [ "`uname`" = "Linux" ] ; then - # try to determine JVM stack minimum by using too-small stack - # (note that 16k causes segfault and smaller prints invalid size error) - java_min_stack=`"${JAVA:-java}" -Xss32k 2>&1 | sed -nr 's/The stack size specified is too small, Specify at least ([0-9]+k)/\1/p'` + java_version=`"${JAVA:-java}" -version 2>&1 | awk '/version/ {print $3}' | egrep -o '[0-9]+\.[0-9]+'` # 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. - if [ -n "$java_min_stack" ] + if [ "$java_version" = "1.7" ] then - JVM_OPTS="$JVM_OPTS -Xss$java_min_stack" + JVM_OPTS="$JVM_OPTS -Xss160k" + else + JVM_OPTS="$JVM_OPTS -Xss128k" fi fi echo "xss = $JVM_OPTS"
