Updated Branches: refs/heads/trunk 1ecd9b7e9 -> ecda83471
add UseCondCardMark XX jvm settings on jdk 1.7 patch by jbellis reviewed by dbrosius for CASSANDRA-4366 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ecda8347 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ecda8347 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ecda8347 Branch: refs/heads/trunk Commit: ecda83471c94d7bb1afc7e3ae7e45f760b8ab572 Parents: 1ecd9b7 Author: Dave Brosius <[email protected]> Authored: Thu Jun 21 16:01:59 2012 -0400 Committer: Dave Brosius <[email protected]> Committed: Thu Jun 21 16:03:40 2012 -0400 ---------------------------------------------------------------------- CHANGES.txt | 2 +- conf/cassandra-env.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ecda8347/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 344c87b..0e717d0 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,11 +1,11 @@ 1.2-dev + * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366) * split up rpc timeout by operation type (CASSANDRA-2819) * rewrite key cache save/load to use only sequential i/o (CASSANDRA-3762) * update MS protocol with a version handshake + broadcast address id (CASSANDRA-4311) * multithreaded hint replay (CASSANDRA-4189) * add inter-node message compression (CASSANDRA-3127) - * enforce 1m min keycache for auto (CASSANDRA-4306) * remove COPP (CASSANDRA-2479) * Track tombstone expiration and compact when tombstone content is higher than a configurable threshold, default 20% (CASSANDRA-3442) http://git-wip-us.apache.org/repos/asf/cassandra/blob/ecda8347/conf/cassandra-env.sh ---------------------------------------------------------------------- diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh index a3ca022..6d71171 100644 --- a/conf/cassandra-env.sh +++ b/conf/cassandra-env.sh @@ -169,6 +169,10 @@ JVM_OPTS="$JVM_OPTS -XX:SurvivorRatio=8" JVM_OPTS="$JVM_OPTS -XX:MaxTenuringThreshold=1" JVM_OPTS="$JVM_OPTS -XX:CMSInitiatingOccupancyFraction=75" JVM_OPTS="$JVM_OPTS -XX:+UseCMSInitiatingOccupancyOnly" +if [ "$java_version" = "1.7" ] +then + JVM_OPTS="$JVM_OPTS -XX:+UseCondCardMark" +fi # GC logging options -- uncomment to enable # JVM_OPTS="$JVM_OPTS -XX:+PrintGCDetails"
