Restrict support for CMS to pre-JDK 14 (#49123)

JDK 14 has removed CMS. This commit restricts the support for CMS to JDK
8 through JDK 13, and defaults to G1 GC on JDK 14. We will revisit all
defaults in the future, but this ensures that we run with a
properly-configured garbage collector on JDK 14+.
This commit is contained in:
Jason Tedor 2019-11-15 08:51:29 -05:00
parent a000d868a0
commit 6075c30c6c
No known key found for this signature in database
GPG Key ID: FA89F05560F16BC5
1 changed files with 11 additions and 10 deletions

View File

@ -33,18 +33,19 @@
################################################################ ################################################################
## GC configuration ## GC configuration
-XX:+UseConcMarkSweepGC 8-13:-XX:+UseConcMarkSweepGC
-XX:CMSInitiatingOccupancyFraction=75 8-13:-XX:CMSInitiatingOccupancyFraction=75
-XX:+UseCMSInitiatingOccupancyOnly 8-13:-XX:+UseCMSInitiatingOccupancyOnly
## G1GC Configuration ## G1GC Configuration
# NOTE: G1GC is only supported on JDK version 10 or later. # NOTE: G1 GC is only supported on JDK version 10 or later
# To use G1GC uncomment the lines below. # to use G1GC, uncomment the next two lines and update the version on the
# 10-:-XX:-UseConcMarkSweepGC # following three lines to your version of the JDK
# 10-:-XX:-UseCMSInitiatingOccupancyOnly # 10-13:-XX:-UseConcMarkSweepGC
# 10-:-XX:+UseG1GC # 10-13:-XX:-UseCMSInitiatingOccupancyOnly
# 10-:-XX:G1ReservePercent=25 14-:-XX:+UseG1GC
# 10-:-XX:InitiatingHeapOccupancyPercent=30 14-:-XX:G1ReservePercent=25
14-:-XX:InitiatingHeapOccupancyPercent=30
## JVM temporary directory ## JVM temporary directory
-Djava.io.tmpdir=${ES_TMPDIR} -Djava.io.tmpdir=${ES_TMPDIR}