[CLOUD-3188] Move GC logs to PREPEND_JAVA_OPTS to bypass the specific…

… EAP checks
wildfly · Dec 5, 2019 · e280a8f · e280a8f
1 parent 140cbd9
commit e280a8f
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/...ontent/java/added/src/main/resources/packages/wildfly.s2i.java/content/bin/java-conf.conf b/...ontent/java/added/src/main/resources/packages/wildfly.s2i.java/content/bin/java-conf.conf
@@ -5,6 +5,14 @@ export GC_MAX_METASPACE_SIZE=${GC_MAX_METASPACE_SIZE:-256}
 
 JAVA_OPTS="$(adjust_java_options ${JAVA_OPTS})"
 
+# CLOUD-3188 if JAVA_DIAGNOSTICS and the JDK specific diagnostics contain any GC log configuration, move the settings to PREPEND_JAVA_OPTS
+# to bypass the specific EAP checks done on JAVA_OPTS in standalone.sh that could remove the GC EAP specific log configurations
+JDK_DIAGNOSTICS=$(jvm_specific_diagnostics)
+if [ "x$JAVA_DIAGNOSTICS" != "x" ] && [ "x{JDK_DIAGNOSTICS}" != "x" ] && grep -q "\-Xlog:gc" <<< "${JDK_DIAGNOSTICS}"; then
+  JAVA_OPTS=${JAVA_OPTS/${JDK_DIAGNOSTICS} /}
+  PREPEND_JAVA_OPTS="${PREPEND_JAVA_OPTS} ${JDK_DIAGNOSTICS}"
+fi
+
 # Make sure that we use /dev/urandom (CLOUD-422)
 JAVA_OPTS="${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom"