Merge pull request #604 from jmtd/OPENJDK-4030-rm-jvm-specific-diagnostics

Openjdk 4030 rm jvm specific diagnostics

Author: jmtd

modules/jdk/21/artifacts/opt/jboss/container/openjdk/jdk/jvm-options

@@ -1,11 +1,5 @@
-#!/bin/sh
-# Configure module
-set -e
-
-SCRIPT_DIR=$(dirname $0)
-ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
-
-install -m 0644 -D {${ARTIFACTS_DIR},}/opt/jboss/container/openjdk/jdk/jvm-options
+#!/bin/bash
+set -euo pipefail
 
 # Update securerandom.source for quicker starts (must be done after removing jdk 8, or it will hit the wrong files)
 JAVA_SECURITY_FILE=/usr/lib/jvm/java/conf/security/java.security

modules/jdk/21/configure.sh

@@ -30,6 +30,3 @@ modules:
   install:
   - name: jboss.container.user
   - name: jboss.container.openjdk
-
-execute:
-- script: configure.sh

modules/jre/21/artifacts/opt/jboss/container/openjdk/jre/jvm-options

@@ -10,10 +10,6 @@ jvm_specific_options() {
   :
 }
 
-jvm_specific_diagnostics() {
-  :
-}
-
 # Include overridden jvm_specific_*() functions
 if [ -f "${JBOSS_CONTAINER_OPENJDK_JDK_MODULE}/jvm-options" ]; then
   source "${JBOSS_CONTAINER_OPENJDK_JDK_MODULE}/jvm-options"
@@ -38,7 +34,7 @@ max_memory() {
 # Switch on diagnostics except when switched off
 diagnostics() {
   if [ "x$JAVA_DIAGNOSTICS" != "x" ]; then
-    echo "$(jvm_specific_diagnostics)"
+    echo "-Xlog:gc::utctime -XX:NativeMemoryTracking=summary"
   fi
 }
 

modules/jre/21/configure.sh

@@ -32,7 +32,7 @@ envs:
   description:  Specify the maximum heap memory. Corresponds to the JVM argument `-XX:MaxRAMPercentage`. The default is `80.0` which means 80% of the available memory. You can disable this mechanism by setting the value to `0`. The supplied value can be an integer or float, but only the whole number part is used.
   example: "90.0"
 - name:         JAVA_DIAGNOSTICS
-  description:  "Set this to get some diagnostics information to standard output when things are happening. **Note: ** This option, if set to true, will set `-XX :+UnlockDiagnosticVMOptions`. **Disabled by default.**"
+  description:  "Set this to get some diagnostics information from the JVM (e.g. GC, memory tracking) to standard output. **Disabled by default.**"
   example:      "true"
 - name:         JAVA_DEBUG
   description:  If set remote debugging will be switched on. **Disabled by default.**