feature : Support JDK 11

issue #214
alibaba · Nov 16, 2018 · b6e1ad9 · b6e1ad9
1 parent c00f796
commit b6e1ad9
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 22 deletions.
diff --git a/distribution/bin/startup.cmd b/distribution/bin/startup.cmd
@@ -23,15 +23,18 @@ for %%d in (%BASE_DIR%) do set BASE_DIR=%%~dpd
 set DEFAULT_SEARCH_LOCATIONS="classpath:/,classpath:/config/,file:./,file:./config/"
 set CUSTOM_SEARCH_LOCATIONS=%DEFAULT_SEARCH_LOCATIONS%,file:%BASE_DIR%conf/
 
-set "JAVA_OPT=%JAVA_OPT% -server -Xms2g -Xmx2g -Xmn1g -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=320m"
-set "JAVA_OPT=%JAVA_OPT% -XX:+UseConcMarkSweepGC -XX:+UseCMSCompactAtFullCollection -XX:CMSInitiatingOccupancyFraction=70 -XX:+CMSParallelRemarkEnabled -XX:SoftRefLRUPolicyMSPerMB=0 -XX:+CMSClassUnloadingEnabled -XX:SurvivorRatio=8 -XX:-UseParNewGC"
-set "JAVA_OPT=%JAVA_OPT% -verbose:gc -Xloggc:"%USERPROFILE%\rmq_srv_gc.log" -XX:+PrintGCDetails"
-set "JAVA_OPT=%JAVA_OPT% -Dnacos.home=%BASE_DIR%"
 
-if not ""%2"" == "cluster" set "JAVA_OPT=%JAVA_OPT% -Dnacos.standalone=true"
 
-set "JAVA_OPT=%JAVA_OPT% -XX:-OmitStackTraceInFastThrow"
-set "JAVA_OPT=%JAVA_OPT% -XX:-UseLargePages"
+if not ""%2"" == "cluster" (
+ set "JAVA_OPT=%JAVA_OPT% -Xms512m -Xmx512m -Xmn256m"
+ set "JAVA_OPT=%JAVA_OPT% -Dnacos.standalone=true"
+ ) else (
+ set "JAVA_OPT=%JAVA_OPT% -server -Xms2g -Xmx2g -Xmn1g -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=320m"
+ set "JAVA_OPT=%JAVA_OPT% -XX:-OmitStackTraceInFastThrow XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=%BASE_DIR%\logs\java_heapdump.hprof"
+ set "JAVA_OPT=%JAVA_OPT% -XX:-UseLargePages"
+ )
+
+set "JAVA_OPT=%JAVA_OPT% -Dnacos.home=%BASE_DIR%"
 set "JAVA_OPT=%JAVA_OPT% -jar %BASE_DIR%\target\nacos-server.jar"
 set "JAVA_OPT=%JAVA_OPT% --spring.config.location="%CUSTOM_SEARCH_LOCATIONS%""
 set "JAVA_OPT=%JAVA_OPT% --logging.config="%BASE_DIR%/conf/nacos-logback.xml""

diff --git a/distribution/bin/startup.sh b/distribution/bin/startup.sh
@@ -46,34 +46,54 @@ export CUSTOM_SEARCH_LOCATIONS=${DEFAULT_SEARCH_LOCATIONS},file:${BASE_DIR}/conf
 #===========================================================================================
 # JVM Configuration
 #===========================================================================================
-JAVA_OPT="${JAVA_OPT} -server -Xms2g -Xmx2g -Xmn1g -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=320m"
-JAVA_OPT="${JAVA_OPT} -Xdebug -Xrunjdwp:transport=dt_socket,address=9555,server=y,suspend=n"
-JAVA_OPT="${JAVA_OPT} -XX:+UseConcMarkSweepGC -XX:+UseCMSCompactAtFullCollection -XX:CMSInitiatingOccupancyFraction=70 -XX:+CMSParallelRemarkEnabled -XX:SoftRefLRUPolicyMSPerMB=0 -XX:+CMSClassUnloadingEnabled -XX:SurvivorRatio=8 -XX:-UseParNewGC"
-JAVA_OPT="${JAVA_OPT} -verbose:gc -Xloggc:${BASE_DIR}/logs/nacos_gc.log -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCApplicationStoppedTime -XX:+PrintAdaptiveSizePolicy"
-JAVA_OPT="${JAVA_OPT} -Dnacos.home=${BASE_DIR}"
 if [[ "${MODE}" == "standalone" ]]; then
+ JAVA_OPT="${JAVA_OPT} -Xms512m -Xmx512m -Xmn256m"
  JAVA_OPT="${JAVA_OPT} -Dnacos.standalone=true"
+else
+ JAVA_OPT="${JAVA_OPT} -server -Xms2g -Xmx2g -Xmn1g -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=320m"
+ JAVA_OPT="${JAVA_OPT} -XX:-OmitStackTraceInFastThrow -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${BASE_DIR}/logs/java_heapdump.hprof"
+ JAVA_OPT="${JAVA_OPT} -XX:-UseLargePages"
+
+fi
+
+# GC options
+# The first segment of the version number, which is '1' for releases before Java 9
+# it then becomes '9', '10', ...
+# Some examples of the first line of `java --version`:
+# 8 -> java version "1.8.0_152"
+# 9.0.4 -> java version "9.0.4"
+# 10 -> java version "10" 2018-03-20
+# 10.0.1 -> java version "10.0.1" 2018-04-17
+# We need to match to the end of the line to prevent sed from printing the characters that do not match
+JAVA_MAJOR_VERSION=$($JAVA -version 2>&1 | sed -E -n 's/.* version "([0-9]*).*$/\1/p')
+if [[ "$JAVA_MAJOR_VERSION" -ge "9" ]] ; then
+ KAFKA_GC_LOG_OPTS="-Xlog:gc*:file=${BASE_DIR}/logs/nacos_gc.log:time,tags:filecount=10,filesize=102400"
+else
+ KAFKA_GC_LOG_OPTS="-Xloggc:${BASE_DIR}/logs/nacos_gc.log -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCTimeStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=100M"
 fi
-JAVA_OPT="${JAVA_OPT} -XX:-OmitStackTraceInFastThrow"
-JAVA_OPT="${JAVA_OPT} -XX:-UseLargePages"
+
+
+JAVA_OPT="${JAVA_OPT} -Dnacos.home=${BASE_DIR}"
 JAVA_OPT="${JAVA_OPT} -jar ${BASE_DIR}/target/nacos-server.jar"
 JAVA_OPT="${JAVA_OPT} ${JAVA_OPT_EXT}"
 JAVA_OPT="${JAVA_OPT} --spring.config.location=${CUSTOM_SEARCH_LOCATIONS}"
 JAVA_OPT="${JAVA_OPT} --logging.config=${BASE_DIR}/conf/nacos-logback.xml"
+
 if [ ! -d "${BASE_DIR}/logs" ]; then
  mkdir ${BASE_DIR}/logs
 fi
 
 echo "$JAVA ${JAVA_OPT}"
 
 if [[ "${MODE}" == "standalone" ]]; then
+ echo "nacos is starting"
  $JAVA ${JAVA_OPT}
 else
  if [ ! -f "${BASE_DIR}/logs/start.out" ]; then
- touch "${BASE_DIR}/logs/start.out"
+  touch "${BASE_DIR}/logs/start.out"
  fi
 
- echo "$JAVA ${JAVA_OPT}" >> ${BASE_DIR}/logs/start.out 2>&1 &
+ echo "$JAVA ${JAVA_OPT}" > ${BASE_DIR}/logs/start.out 2>&1 &
  nohup $JAVA ${JAVA_OPT} >> ${BASE_DIR}/logs/start.out 2>&1 &
  echo "nacos is starting，you can check the ${BASE_DIR}/logs/start.out"
 fi
diff --git a/pom.xml b/pom.xml
@@ -232,19 +232,17 @@
  <exclude>style/codeStyle.md</exclude>
  <exclude>REPORTING-BUGS.md</exclude>
  <exclude>README.md</exclude>
- <exclude>.github/*</exclude>
- <exclude>.github/ISSUE_TEMPLATE/bug_report.md</exclude>
- <exclude>.github/ISSUE_TEMPLATE/feature_request.md</exclude>
+ <exclude>.github/**/*</exclude>
  <exclude>src/main/resources/*/*/*</exclude>
  <exclude>src/main/resources/*/*</exclude>
  <exclude>src/main/resources/*</exclude>
  <exclude>src/test/resources/*</exclude>
  <exclude>src/main/resources/static/**/*.js</exclude>
  <exclude>src/main/resources/**/*.svg</exclude>
  <exclude>src/main/resources/static/public/css/console1412.css</exclude>
- <exclude>/src/main/resources/static/js/vs/editor/editor.main.css</exclude>
- <exclude>src/main/resources/static/console-fe/public/css/console1412.css</exclude>
+ <exclude>src/main/resources/static/js/vs/**/*</exclude>
  <exclude>src/main/resources/static/console-fe/public/js/vs/editor/editor.main.css</exclude>
+ <exclude>src/main/resources/static/console-fe/public/css/console1412.css</exclude>
  <exclude>src/main/resources/static/console-fe/.vscode/settings.json</exclude>
  <exclude>bin/*</exclude>
  <exclude>conf/*</exclude>
@@ -306,10 +304,13 @@
  </plugin>
  <plugin>
  <artifactId>maven-surefire-plugin</artifactId>
- <version>2.19.1</version>
+ <version>2.22.0</version>
  <configuration>
  <forkCount>1</forkCount>
  <reuseForks>true</reuseForks>
+ <argLine>
+ --illegal-access=permit
+ </argLine>
  </configuration>
  </plugin>
  <plugin>