Fix the java options.

templates/jvm.options.j2

@@ -11,16 +11,13 @@
 ## -Xms4g
 ## -Xmx4g
 ##
-## See https://www.elastic.co/guide/en/elasticsearch/reference/current/heap-size.html
-## for more information
-##
 ################################################################
 
 # Xms represents the initial size of total heap space
 # Xmx represents the maximum size of total heap space
 
--Xms{{ elasticsearch_heap_size }}
--Xmx{{ elasticsearch_heap_size }}
+-Xms{{ opensearch_heap_size }}
+-Xmx{{ opensearch_heap_size }}
 
 ################################################################
 ## Expert settings
@@ -73,10 +70,6 @@
 -Dlog4j.shutdownHookEnabled=false
 -Dlog4j2.disable.jmx=true
 
-{% if elasticsearch_major_version >= 6 %}
--Djava.io.tmpdir=${ES_TMPDIR}
-{% endif %}
-
 ## heap dumps
 
 # generate a heap dump when an allocation from the Java heap fails
@@ -87,6 +80,25 @@
 # ensure the directory exists and has sufficient space
 #-XX:HeapDumpPath=${heap.dump.path}
 
+
+## GC configuration
+8-13:-XX:+UseConcMarkSweepGC
+8-13:-XX:CMSInitiatingOccupancyFraction=75
+8-13:-XX:+UseCMSInitiatingOccupancyOnly
+
+## G1GC Configuration
+# NOTE: G1 GC is only supported on JDK version 10 or later
+# to use G1GC, uncomment the next two lines and update the version on the
+# following three lines to your version of the JDK
+# 10-13:-XX:-UseConcMarkSweepGC
+# 10-13:-XX:-UseCMSInitiatingOccupancyOnly
+14-:-XX:+UseG1GC
+14-:-XX:G1ReservePercent=25
+14-:-XX:InitiatingHeapOccupancyPercent=30
+
+## JVM temporary directory
+-Djava.io.tmpdir=${OPENSEARCH_TMPDIR}
+
 ## GC logging
 
 #-XX:+PrintGCDetails
@@ -101,31 +113,4 @@
 # ensure the directory exists
 #-Xloggc:${loggc}
 
-# Elasticsearch 5.0.0 will throw an exception on unquoted field names in JSON.
-# If documents were already indexed with unquoted fields in a previous version
-# of Elasticsearch, some operations may throw errors.
-#
-# WARNING: This option will be removed in Elasticsearch 6.0.0 and is provided
-# only for migration purposes.
-#-Delasticsearch.json.allow_unquoted_field_names=true
-# specify an alternative path for heap dumps
-# ensure the directory exists and has sufficient space
--XX:HeapDumpPath={{ elasticsearch_data_dir }}
-
-## JDK 8 GC logging
-
-8:-XX:+PrintGCDetails
-8:-XX:+PrintGCDateStamps
-8:-XX:+PrintTenuringDistribution
-8:-XX:+PrintGCApplicationStoppedTime
-8:-Xloggc:/var/log/elasticsearch/gc.log
-8:-XX:+UseGCLogFileRotation
-8:-XX:NumberOfGCLogFiles=32
-8:-XX:GCLogFileSize=64m
-
-# JDK 9+ GC logging
-9-:-Xlog:gc*,gc+age=trace,safepoint:file=/var/log/elasticsearch/gc.log:utctime,pid,tags:filecount=32,filesize=64m
-# due to internationalization enhancements in JDK 9 Elasticsearch need to set the provider to COMPAT otherwise
-# time/date parsing will break in an incompatible way for some date patterns and locals
-9-:-Djava.locale.providers=COMPAT
-
+-XX:HeapDumpPath={{ opensearch_data_dir }}