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/62838b93 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/62838b93 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/62838b93 Branch: refs/heads/trunk Commit: 62838b93b13f9029665b30af24a9576ae3d01ab6 Parents: 72241f6 f92291c Author: Brandon Williams <[email protected]> Authored: Tue Aug 5 17:53:40 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Tue Aug 5 17:53:40 2014 -0500 ---------------------------------------------------------------------- conf/cassandra-env.sh | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/62838b93/conf/cassandra-env.sh ---------------------------------------------------------------------- diff --cc conf/cassandra-env.sh index 1a8f08d,5e2fb87..be84e6e --- a/conf/cassandra-env.sh +++ b/conf/cassandra-env.sh @@@ -217,9 -212,12 +217,13 @@@ JVM_OPTS="$JVM_OPTS -XX:MaxTenuringThre JVM_OPTS="$JVM_OPTS -XX:CMSInitiatingOccupancyFraction=75" JVM_OPTS="$JVM_OPTS -XX:+UseCMSInitiatingOccupancyOnly" JVM_OPTS="$JVM_OPTS -XX:+UseTLAB" +JVM_OPTS="$JVM_OPTS -XX:CompileCommandFile=$CASSANDRA_CONF/hotspot_compiler" # note: bash evals '1.7.x' as > '1.7' so this is really a >= 1.7 jvm check + if { [ "$JVM_VERSION" \> "1.7" ] && [ "$JVM_VERSION" \< "1.8.0" ] && [ "$JVM_PATCH_VERSION" -ge "60" ]; } || [ "$JVM_VERSION" \> "1.8" ] ; then + JVM_OPTS="$JVM_OPTS -XX:+CMSParallelInitialMarkEnabled -XX:+CMSEdenChunksRecordAlways" + fi + if [ "$JVM_ARCH" = "64-Bit" ] ; then JVM_OPTS="$JVM_OPTS -XX:+UseCondCardMark" fi
