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 2015/01/19 20:48:04 UTC
[2/3] cassandra git commit: add missing jvm opts back
add missing jvm opts back
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d469b4b8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d469b4b8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d469b4b8
Branch: refs/heads/trunk
Commit: d469b4b817f8d108e33f69bba3c94ea792f2d9e9
Parents: f88864c
Author: Brandon Williams <br...@apache.org>
Authored: Mon Jan 19 13:47:49 2015 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Jan 19 13:47:49 2015 -0600
----------------------------------------------------------------------
conf/cassandra-env.sh | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d469b4b8/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index 755f962..3f4c21b 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -221,6 +221,10 @@ JVM_OPTS="$JVM_OPTS -XX:CompileCommandFile=$CASSANDRA_CONF/hotspot_compiler"
JVM_OPTS="$JVM_OPTS -XX:CMSWaitDuration=10000"
# 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 -XX:CMSWaitDuration=10000"
+fi
+
if [ "$JVM_ARCH" = "64-Bit" ] ; then
JVM_OPTS="$JVM_OPTS -XX:+UseCondCardMark"
fi