From b7cb918ab021a0b7efc27f9e89458e914e9c3584 Mon Sep 17 00:00:00 2001
From: myPrecious <Moriadry@users.noreply.github.com>
Date: Fri, 31 Jan 2020 12:40:43 +0800
Subject: [PATCH] switching cms collector to g1 (#5702)

---
 .../src/main/resources/META-INF/assembly/bin/start.sh  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/start.sh b/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/start.sh
index 5ab56d4729..6994e7d421 100755
--- a/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/start.sh
+++ b/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/start.sh
@@ -79,6 +79,7 @@ fi
 JAVA_MEM_OPTS=""
 # set jvm args by different java version
 JAVA_VERSION=`java -fullversion 2>&1 | awk -F[\"\.] '{print $2$3$4}' |awk -F"_" '{print $1}'`
+echo $JAVA_VERSION
 VM_ARGS=${VM_ARGS_PERM_SIZE}
 # if you use dubbo in java 9
 TEMP_VERSION=$(echo ${JAVA_VERSION} | grep "+")
@@ -90,9 +91,16 @@ if [ "${JAVA_VERSION}" -ge ${JAVA_8_VERSION} ]; then
     VM_ARGS=${VM_ARGS_METASPACE_SIZE}
 fi
 
+# MaxInlineLevel=15 is the default since JDK 14 and can be removed once older JDKs are no longer supported
 BITS=`java -version 2>&1 | grep -i 64-bit`
+JAVA_MEM_OPTS=" -server -Xmx2g -Xms2g -Xmn256m -XX:${VM_ARGS}=128m -Xss256k -XX:+DisableExplicitGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseCMSCompactAtFullCollection -XX:LargePageSizeInBytes=128m -XX:+UseFastAccessorMethods -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70 "
+
 if [ -n "$BITS" ]; then
-    JAVA_MEM_OPTS=" -server -Xmx2g -Xms2g -Xmn256m -XX:${VM_ARGS}=128m -Xss256k -XX:+DisableExplicitGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseCMSCompactAtFullCollection -XX:LargePageSizeInBytes=128m -XX:+UseFastAccessorMethods -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70 "
+    JAVA_MAJOR_VERSION=${JAVA_VERSION%%[.|-]*}
+    JAVA_MINOR_VERSION=$(echo $JAVA_VERSION | awk -F\. '{ print $2 }')
+    if [ $JAVA_MAJOR_VERSION -ge 9 ] || ([ $JAVA_MAJOR_VERSION -ge 1 ] && [ $JAVA_MINOR_VERSION -ge 8 ]); then
+      JAVA_MEM_OPTS=" -server -Xmx2g -Xms2g -Xmn256m -XX:${VM_ARGS}=128m -Xss256k -XX:LargePageSizeInBytes=128m -XX:+DisableExplicitGC -XX:+UseG1GC -XX:MaxGCPauseMillis=200 -XX:G1HeapRegionSize=16m -XX:G1ReservePercent=25 -XX:InitiatingHeapOccupancyPercent=30 -XX:SoftRefLRUPolicyMSPerMB=0 -XX:SurvivorRatio=8 -XX:G1ReservePercent=15 "
+    fi
 else
     JAVA_MEM_OPTS=" -server -Xms1g -Xmx1g -XX:${VM_ARGS}=128m -XX:SurvivorRatio=2 -XX:+UseParallelGC "
 fi