santerikainulainen/ansible-role-elasticsearch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[7.5.0] update jvm.options template to 7.5.0 dafault values

Browse source
This commit is contained in:
Julien Mailleret 2019-12-06 22:17:53 +01:00
parent 276e228f75
commit 3292766b09
No known key found for this signature in database
GPG key ID: F065093271C8DE71
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
templates/jvm.options.j2
View file

@ -47,13 +47,14 @@
# 10-:-XX:-UseConcMarkSweepGC # 10-:-XX:-UseConcMarkSweepGC
# 10-:-XX:-UseCMSInitiatingOccupancyOnly # 10-:-XX:-UseCMSInitiatingOccupancyOnly
# 10-:-XX:+UseG1GC # 10-:-XX:+UseG1GC
{% if es_version is version('7.3.0', '<=') %} {% if es_version is version('7.4.0', '<') %}
# 10-:-XX:InitiatingHeapOccupancyPercent=75 # 10-:-XX:InitiatingHeapOccupancyPercent=75
{% else %} {% else %}
# 10-:-XX:G1ReservePercent=25 # 10-:-XX:G1ReservePercent=25
# 10-:-XX:InitiatingHeapOccupancyPercent=30 # 10-:-XX:InitiatingHeapOccupancyPercent=30
{% endif %} {% endif %}
{% if es_version is version('7.5.0', '<') %}
## DNS cache policy ## DNS cache policy
# cache ttl in seconds for positive DNS lookups noting that this overrides the # cache ttl in seconds for positive DNS lookups noting that this overrides the
# JDK security property networkaddress.cache.ttl; set to -1 to cache forever # JDK security property networkaddress.cache.ttl; set to -1 to cache forever
@ -97,6 +98,7 @@
# log4j 2 # log4j 2
-Dlog4j.shutdownHookEnabled=false -Dlog4j.shutdownHookEnabled=false
-Dlog4j2.disable.jmx=true -Dlog4j2.disable.jmx=true
{% endif %}
-Djava.io.tmpdir=${ES_TMPDIR} -Djava.io.tmpdir=${ES_TMPDIR}
@ -126,6 +128,7 @@
# JDK 9+ GC logging # JDK 9+ GC logging
9-:-Xlog:gc*,gc+age=trace,safepoint:file={{ es_log_dir }}/gc.log:utctime,pid,tags:filecount=32,filesize=64m 9-:-Xlog:gc*,gc+age=trace,safepoint:file={{ es_log_dir }}/gc.log:utctime,pid,tags:filecount=32,filesize=64m
{% if es_version is version('7.5.0', '<') %}
# due to internationalization enhancements in JDK 9 Elasticsearch need to set the provider to COMPAT otherwise # 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 # time/date parsing will break in an incompatible way for some date patterns and locals
9-:-Djava.locale.providers=COMPAT 9-:-Djava.locale.providers=COMPAT
@ -134,6 +137,7 @@
# temporary workaround for C2 bug with JDK 10 on hardware with AVX-512 # temporary workaround for C2 bug with JDK 10 on hardware with AVX-512
10-:-XX:UseAVX=2 10-:-XX:UseAVX=2
{% endif %} {% endif %}
{% endif %}
{% if es_jvm_custom_parameters !='' %} {% if es_jvm_custom_parameters !='' %}
{% for item in es_jvm_custom_parameters %} {% for item in es_jvm_custom_parameters %}