Merge pull request #382 from oracle/issue-379

Issue 379

helm-charts/coherence/scripts/startCoherence.sh

@@ -229,7 +229,7 @@ start()
 
     MEM_OPTS="-XX:HeapDumpPath=${JVM_DIR}/heap-dumps/${COH_MEMBER_NAME}-${COH_POD_UID}.hprof"
     COH_JVM_ARGS="-Dcoherence.ttl=0 -XshowSettings:all -XX:+PrintCommandLineFlags -XX:+PrintFlagsFinal \
-                  -XX:+UnlockDiagnosticVMOptions -XX:+UnlockCommercialFeatures -XX:+UnlockExperimentalVMOptions \
+                  -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions \
                   -XX:ErrorFile=${JVM_DIR}/hs-err-${COH_MEMBER_NAME}-${COH_POD_UID}.log"
 
     if [[ "${JVM_JMXMP_ENABLED}" == "true" ]]
@@ -298,7 +298,11 @@ start()
 
     if [[ "${JVM_FLIGHT_RECORDER}" == "true" ]]
     then
-        COH_JVM_ARGS="${COH_JVM_ARGS} -XX:+FlightRecorder -XX:FlightRecorderOptions=defaultrecording=true,dumponexit=true,dumponexitpath=${JVM_DIR}/jfr"
+        ${JAVA_HOME}/bin/java -cp ${COH_UTIL_DIR}/lib/* com.oracle.coherence.k8s.JvmInfo java.vm.name | grep HotSpot
+        if [[ "$?" == "0" ]]
+        then
+          COH_JVM_ARGS="${COH_JVM_ARGS} -XX:+UnlockCommercialFeatures -XX:+FlightRecorder -XX:FlightRecorderOptions=defaultrecording=true,dumponexit=true,dumponexitpath=${JVM_DIR}/jfr"
+        fi
     fi
 
     if [[ "${JVM_USE_CONTAINER_LIMITS}" == "true" ]]

java/coherence-utils/src/main/java/com/oracle/coherence/k8s/JvmInfo.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Licensed under the Universal Permissive License v 1.0 as shown at
+ * http://oss.oracle.com/licenses/upl.
+ */
+
+package com.oracle.coherence.k8s;
+
+/**
+ * Determine the JVM information.
+ */
+public class JvmInfo {
+
+    private JvmInfo() {
+    }
+
+    /**
+     * Program entry point.
+     *
+     * @param args the program command line arguments
+     */
+    public static void main(String[] args) {
+        if (args.length > 0) {
+            System.out.println(System.getProperty(args[0]));
+        }
+    }
+}