Updated Branches: refs/heads/cassandra-2.0 2c4b043f9 -> 1bd7ac3c4 refs/heads/trunk 0c56a5ece -> db5c95cdc
Only pass UseCondCardMark to 64bit JVMs Patch by brandonwilliams, reviewed by eevans for CASSANDRA-6190 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1bd7ac3c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1bd7ac3c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1bd7ac3c Branch: refs/heads/cassandra-2.0 Commit: 1bd7ac3c4b1be9f4fac19c379504eb0e95346ec0 Parents: 2c4b043 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Oct 25 15:27:40 2013 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Oct 25 15:28:22 2013 -0500 ---------------------------------------------------------------------- conf/cassandra-env.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1bd7ac3c/conf/cassandra-env.sh ---------------------------------------------------------------------- diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh index d84c7ce..e8aa3a4 100644 --- a/conf/cassandra-env.sh +++ b/conf/cassandra-env.sh @@ -135,7 +135,6 @@ esac # Set this to control the amount of arenas per-thread in glibc #MALLOC_ARENA_MAX=4 - if [ "x$MAX_HEAP_SIZE" = "x" ] && [ "x$HEAP_NEWSIZE" = "x" ]; then calculate_heap_sizes else @@ -208,7 +207,7 @@ JVM_OPTS="$JVM_OPTS -XX:CMSInitiatingOccupancyFraction=75" JVM_OPTS="$JVM_OPTS -XX:+UseCMSInitiatingOccupancyOnly" JVM_OPTS="$JVM_OPTS -XX:+UseTLAB" # note: bash evals '1.7.x' as > '1.7' so this is really a >= 1.7 jvm check -if [ "$JVM_VERSION" \> "1.7" ] ; then +if [ "$JVM_VERSION" \> "1.7" ] && [ "$JVM_ARCH" = "64-Bit" ] ; then JVM_OPTS="$JVM_OPTS -XX:+UseCondCardMark" fi
