Skip to content

Commit 0904531

Browse files
committed
Move elasticsearch to OpenJDK 11
OpenJDK 11 is supported with ES since 6.5: https://www.elastic.co/support/matrix#matrix_jvm The bulk of these changes are needed for changes in supported JVM options between 8 and 11.
1 parent fa2991b commit 0904531

File tree

6 files changed

+6
-9
lines changed

6 files changed

+6
-9
lines changed

elasticsearch/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ENV ES_PATH_CONF=/etc/elasticsearch/ \
1111
ES_VER=6.8.1.redhat-6 \
1212
HOME=/opt/app-root/src \
1313
INSTANCE_RAM=512G \
14-
JAVA_VER=1.8.0 \
14+
JAVA_VER=11 \
1515
JAVA_HOME=/usr/lib/jvm/jre \
1616
NODE_QUORUM=1 \
1717
PROMETHEUS_EXPORTER_VER=6.8.1.0-redhat-1 \

elasticsearch/Dockerfile.origin

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ENV ES_PATH_CONF=/etc/elasticsearch/ \
1111
ES_VER=6.8.1 \
1212
HOME=/opt/app-root/src \
1313
INSTANCE_RAM=512G \
14-
JAVA_VER=1.8.0 \
14+
JAVA_VER=11 \
1515
JAVA_HOME=/usr/lib/jvm/jre \
1616
NODE_QUORUM=1 \
1717
PROMETHEUS_EXPORTER_VER=6.8.1.0 \

elasticsearch/Dockerfile.rhel8

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ENV ES_PATH_CONF=/etc/elasticsearch/ \
1111
ES_VER=6.8.1.redhat-6 \
1212
HOME=/opt/app-root/src \
1313
INSTANCE_RAM=512G \
14-
JAVA_VER=1.8.0 \
14+
JAVA_VER=11 \
1515
JAVA_HOME=/usr/lib/jvm/jre \
1616
NODE_QUORUM=1 \
1717
PROMETHEUS_EXPORTER_VER=6.8.1.0-redhat-1 \

elasticsearch/extra-jvm.options

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
-XX:+UnlockExperimentalVMOptions
2-
-XX:+UseCGroupMemoryLimitForHeap
32
-XX:MaxRAMFraction=2
43
-XX:InitialRAMFraction=2
54
-XX:MinRAMFraction=2

elasticsearch/install-es.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ mkdir -p ${ES_PATH_CONF}/scripts
2828
chmod 777 ${ES_PATH_CONF}/scripts
2929
install -m 660 config/* ${ES_PATH_CONF}
3030
popd
31-
sed -i -e 's/^-Xms/#-Xms/' -e 's/^-Xmx/#-Xmx/' ${ES_PATH_CONF}/jvm.options
31+
sed -i -e 's/^-Xms/#-Xms/' -e 's/^-Xmx/#-Xmx/' -e '/-Xlog/d' ${ES_PATH_CONF}/jvm.options
32+
[[ `arch` = x86_64 ]] || sed -i -e '/UseAVX/d' ${ES_PATH_CONF}/jvm.options
3233
cat extra-jvm.options >> ${ES_PATH_CONF}/jvm.options
3334
groupadd -r elasticsearch -g 1000
3435
useradd -r -g elasticsearch -d ${ES_HOME} -u 1000 \

elasticsearch/run.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,9 @@ GC_LOG_LOCATION=/elasticsearch/persistent/${CLUSTER_NAME}/logs/gc.log
9090

9191
ERR_FILE_LOCATION=/elasticsearch/persistent/${CLUSTER_NAME}/logs/error.log
9292

93-
export ES_JAVA_OPTS="${ES_JAVA_OPTS:-} -XX:HeapDumpPath=$HEAP_DUMP_LOCATION -Xloggc:$GC_LOG_LOCATION -XX:ErrorFile=$ERR_FILE_LOCATION"
93+
export ES_JAVA_OPTS="${ES_JAVA_OPTS:-} -XX:HeapDumpPath=$HEAP_DUMP_LOCATION -Xlog:gc*,gc+age=trace,safepoint:file=${GC_LOG_LOCATION}:utctime,pid,tags:filecount=32,filesize=64m -XX:ErrorFile=$ERR_FILE_LOCATION"
9494
info "ES_JAVA_OPTS: '${ES_JAVA_OPTS}'"
9595

96-
# if we use java9 or later, we'll also have to configure this:
97-
# -:-Xlog:gc*,gc+age=trace,safepoint:file=logs/gc.log:utctime,pid,tags:filecount=2,filesize=64m
98-
9996
DHE_TMP_KEY_SIZE=${DHE_TMP_KEY_SIZE:-2048}
10097
export ES_JAVA_OPTS="${ES_JAVA_OPTS:-} -Djdk.tls.ephemeralDHKeySize=$DHE_TMP_KEY_SIZE"
10198

0 commit comments

Comments
 (0)