cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcken...@apache.org
Subject cassandra git commit: Disable memory mapping of hsperfdata files for JVM statistics
Date Wed, 29 Apr 2015 19:15:23 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk 1f3ab8109 -> 33f37f86f


Disable memory mapping of hsperfdata files for JVM statistics

Patch by Ariel Weisberg; reviewed by jmckenzie for CASSANDRA-9242


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

Branch: refs/heads/trunk
Commit: 33f37f86f64a570d63c7102b11ea455ff4a4806d
Parents: 1f3ab81
Author: Ariel Weisberg <ariel.weisberg@datastax.com>
Authored: Wed Apr 29 14:14:08 2015 -0500
Committer: Josh McKenzie <josh.mckenzie@datastax.com>
Committed: Wed Apr 29 14:14:08 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt            | 1 +
 conf/cassandra-env.ps1 | 3 +++
 conf/cassandra-env.sh  | 1 +
 3 files changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/33f37f86/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c6f0813..b7d9c75 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0
+ * Disable memory mapping of hsperfdata file for JVM statistics (CASSANDRA-9242)
  * Add pre-startup checks to detect potential incompatibilities (CASSANDRA-8049)
  * Distinguish between null and unset in protocol v4 (CASSANDRA-7304)
  * Add user/role permissions for user-defined functions (CASSANDRA-7557)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/33f37f86/conf/cassandra-env.ps1
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index 3628de5..362452b 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -389,6 +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:+UseTLAB"
     if (($env:JVM_VERSION.CompareTo("1.7") -eq 1) -and ($env:JVM_ARCH -eq "64-Bit"))
     {
@@ -454,4 +455,6 @@ Function SetCassandraEnvironment
     $env:JVM_OPTS="$env:JVM_OPTS $JVM_EXTRA_OPTS"
 
     $env:JVM_OPTS = "$env:JVM_OPTS -Dlog4j.configuration=log4j-server.properties"
+
+    #$env:JVM_OPTS="$env:JVM_OPTS -XX:+UnlockCommercialFeatures -XX:+FlightRecorder"
 }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/33f37f86/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index 7df703b..d27f55d 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -280,6 +280,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:CompileCommandFile=$CASSANDRA_CONF/hotspot_compiler"
 JVM_OPTS="$JVM_OPTS -XX:CMSWaitDuration=10000"
 


Mime
View raw message