From d6232e04d79d5b0cd5cd066deee0dfc2b8199221 Mon Sep 17 00:00:00 2001 From: Paulo Motta Date: Wed, 27 Jul 2016 12:12:54 -0400 Subject: [PATCH] Add missing options to cassandra-env.ps1 Patch by pmotta; reviewed by jmckenzie for CASSANDRA-10939 --- conf/cassandra-env.ps1 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1 index de94f5e80d..f037b56d2b 100644 --- a/conf/cassandra-env.ps1 +++ b/conf/cassandra-env.ps1 @@ -413,6 +413,9 @@ Function SetCassandraEnvironment } } + # provides hints to the JIT compiler + $env:JVM_OPTS = "$env:JVM_OPTS -XX:CompileCommandFile=$env:CASSANDRA_CONF\hotspot_compiler" + # add the jamm javaagent if (($env:JVM_VENDOR -ne "OpenJDK") -or ($env:JVM_VERSION.CompareTo("1.6.0") -eq 1) -or (($env:JVM_VERSION -eq "1.6.0") -and ($env:JVM_PATCH_VERSION.CompareTo("22") -eq 1))) @@ -420,6 +423,13 @@ Function SetCassandraEnvironment $env:JVM_OPTS = "$env:JVM_OPTS -javaagent:""$env:CASSANDRA_HOME\lib\jamm-0.3.0.jar""" } + # set jvm HeapDumpPath with CASSANDRA_HEAPDUMP_DIR + if ($env:CASSANDRA_HEAPDUMP_DIR) + { + $unixTimestamp = [int64](([datetime]::UtcNow)-(get-date "1/1/1970")).TotalSeconds + $env:JVM_OPTS="$env:JVM_OPTS -XX:HeapDumpPath=$env:CASSANDRA_HEAPDUMP_DIR\cassandra-$unixTimestamp-pid$pid.hprof" + } + if ($env:JVM_VERSION.CompareTo("1.8.0") -eq -1 -or [convert]::ToInt32($env:JVM_PATCH_VERSION) -lt 40) { echo "Cassandra 3.0 and later require Java 8u40 or later."