You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/08/06 00:55:16 UTC
[06/11] git commit: Add new GC flags for java7/8
Add new GC flags for java7/8
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-7432
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f92291c6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f92291c6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f92291c6
Branch: refs/heads/cassandra-2.1
Commit: f92291c62180ff7c49fc4ea0a7ca8eb9df76b8a2
Parents: d5d1adb
Author: Brandon Williams <br...@apache.org>
Authored: Tue Aug 5 17:52:48 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Aug 5 17:52:48 2014 -0500
----------------------------------------------------------------------
conf/cassandra-env.sh | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f92291c6/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index d4e6590..5e2fb87 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -214,6 +214,10 @@ 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" ] && [ "$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