un-revert #4366
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1423fb11 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1423fb11 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1423fb11 Branch: refs/heads/cassandra-1.2 Commit: 1423fb11037ef23aef3e78516d8d2e8f7acb54ba Parents: 27ccc43 Author: Jonathan Ellis <jbel...@apache.org> Authored: Fri Feb 8 10:56:55 2013 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Fri Feb 8 10:56:55 2013 -0600 ---------------------------------------------------------------------- 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/1423fb11/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 33d6786..5d96a0c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -12,6 +12,7 @@ * Improve handling of directory creation failures (CASSANDRA-5196) * Expose secondary indicies to the rest of nodetool (CASSANDRA-4464) * Binary protocol: avoid sending notification for 0.0.0.0 (CASSANDRA-5227) + * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366) 1.2.1 @@ -271,7 +272,6 @@ Merged from 1.1: * remove redundant "name" column from schema_keyspaces (CASSANDRA-4433) * improve "nodetool ring" handling of multi-dc clusters (CASSANDRA-3047) * update NTS calculateNaturalEndpoints to be O(N log N) (CASSANDRA-3881) - * 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 http://git-wip-us.apache.org/repos/asf/cassandra/blob/1423fb11/conf/cassandra-env.sh ---------------------------------------------------------------------- diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh index e38371f..daae043 100644 --- a/conf/cassandra-env.sh +++ b/conf/cassandra-env.sh @@ -202,6 +202,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"
