You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2015/05/21 02:37:48 UTC

cassandra git commit: Fix setting the PerfDisableSharedMem JVM option

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 76b5f30e7 -> b540c5d20


Fix setting the PerfDisableSharedMem JVM option


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b540c5d2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b540c5d2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b540c5d2

Branch: refs/heads/cassandra-2.2
Commit: b540c5d20839f419323de6ff4fb81908a10b592d
Parents: 76b5f30
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu May 21 03:37:38 2015 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu May 21 03:37:38 2015 +0300

----------------------------------------------------------------------
 conf/cassandra-env.ps1 | 2 +-
 conf/cassandra-env.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b540c5d2/conf/cassandra-env.ps1
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index dbf83a3..8dddc2d 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -389,7 +389,7 @@ Function SetCassandraEnvironment
     $env:JVM_OPTS="$env:JVM_OPTS -XX:MaxTenuringThreshold=1"
     $env:JVM_OPTS="$env:JVM_OPTS -XX:CMSInitiatingOccupancyFraction=75"
     $env:JVM_OPTS="$env:JVM_OPTS -XX:+UseCMSInitiatingOccupancyOnly"
-    $env:JVM_OPTS="$env:JVM_OPTS -XX:-PerfDisableSharedMem"
+    $env:JVM_OPTS="$env:JVM_OPTS -XX:+PerfDisableSharedMem"
     $env:JVM_OPTS="$env:JVM_OPTS -XX:+UseTLAB"
     if (($env:JVM_VERSION.CompareTo("1.7") -eq 1) -and ($env:JVM_ARCH -eq "64-Bit"))
     {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b540c5d2/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index 7b9ea28..2dba3f7 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -266,7 +266,7 @@ JVM_OPTS="$JVM_OPTS -XX:MaxTenuringThreshold=1"
 JVM_OPTS="$JVM_OPTS -XX:CMSInitiatingOccupancyFraction=75"
 JVM_OPTS="$JVM_OPTS -XX:+UseCMSInitiatingOccupancyOnly"
 JVM_OPTS="$JVM_OPTS -XX:+UseTLAB"
-JVM_OPTS="$JVM_OPTS -XX:-PerfDisableSharedMem"
+JVM_OPTS="$JVM_OPTS -XX:+PerfDisableSharedMem"
 JVM_OPTS="$JVM_OPTS -XX:CompileCommandFile=$CASSANDRA_CONF/hotspot_compiler"
 JVM_OPTS="$JVM_OPTS -XX:CMSWaitDuration=10000"