From 27867c729d67b02330f8341523d8397528f41afd Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Tue, 12 Apr 2016 21:16:36 -0400 Subject: [PATCH] Additional handling of ES_GC_LOG_FILE This commit adds handling of the old ES_GC_LOG_FILE environment variable to treat it like the other removed environment variables. --- distribution/deb/src/main/packaging/init.d/elasticsearch | 3 --- distribution/src/main/resources/bin/elasticsearch | 4 +++- distribution/src/main/resources/bin/elasticsearch.bat | 2 ++ distribution/src/main/resources/bin/service.bat | 2 ++ 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/distribution/deb/src/main/packaging/init.d/elasticsearch b/distribution/deb/src/main/packaging/init.d/elasticsearch index a8ea9aeff80..66d1518e783 100755 --- a/distribution/deb/src/main/packaging/init.d/elasticsearch +++ b/distribution/deb/src/main/packaging/init.d/elasticsearch @@ -67,9 +67,6 @@ CONF_DIR=/etc/$NAME # Maximum number of VMA (Virtual Memory Areas) a process can own MAX_MAP_COUNT=262144 -# Path to the GC log file -#ES_GC_LOG_FILE=/var/log/elasticsearch/gc.log - # Elasticsearch PID file directory PID_DIR="/var/run/elasticsearch" diff --git a/distribution/src/main/resources/bin/elasticsearch b/distribution/src/main/resources/bin/elasticsearch index 76e78603556..7a7102977f6 100755 --- a/distribution/src/main/resources/bin/elasticsearch +++ b/distribution/src/main/resources/bin/elasticsearch @@ -67,7 +67,8 @@ if [[ !(-z "$ES_MIN_MEM" && -z "$ES_HEAP_NEWSIZE" && -z "$ES_DIRECT_SIZE" && -z "$ES_USE_IPV4" && - -z "$ES_GC_OPTS") ]]; then + -z "$ES_GC_OPTS" && + -z "$ES_GC_LOG_FILE") ]]; then echo "Error: encountered environment variables that are no longer supported" echo "Use jvm.options or ES_JAVA_OPTS to configure the JVM" unsupported_environment_variable "$ES_MIN_MEM" ES_MIN_MEM "set -Xms$ES_MIN_MEM in jvm.options or add \"-Xms$ES_MIN_MEM\" to ES_JAVA_OPTS" @@ -77,6 +78,7 @@ if [[ !(-z "$ES_MIN_MEM" && unsupported_environment_variable "$ES_DIRECT_SIZE" ES_DIRECT_SIZE "set -XX:MaxDirectMemorySize=$ES_DIRECT_SIZE in jvm.options or add \"-XX:MaxDirectMemorySize=$ES_DIRECT_SIZE\" to ES_JAVA_OPTS" unsupported_environment_variable "$ES_USE_IPV4" ES_USE_IPV4 "set -Djava.net.preferIPv4Stack=true in jvm.options or add \"-Djava.net.preferIPv4Stack=true\" to ES_JAVA_OPTS" unsupported_environment_variable "$ES_GC_OPTS" ES_GC_OPTS "set ${ES_GC_OPTS// / and } in jvm.options or add \"$ES_GC_OPTS\" to ES_JAVA_OPTS" + unsupported_environment_variable "$ES_GC_LOG_FILE" ES_GC_LOG_FILE "set -Xloggc:$ES_GC_LOG_FILE in jvm.options or add \"-Xloggc:$ES_GC_LOG_FILE\" to ES_JAVA_OPTS" exit 1 fi # end TODO: remove for Elasticsearch 6.x diff --git a/distribution/src/main/resources/bin/elasticsearch.bat b/distribution/src/main/resources/bin/elasticsearch.bat index 186661f74bc..e6bcc634452 100644 --- a/distribution/src/main/resources/bin/elasticsearch.bat +++ b/distribution/src/main/resources/bin/elasticsearch.bat @@ -13,6 +13,7 @@ if not "%ES_HEAP_NEWSIZE%" == "" set bad_env_var=1 if not "%ES_DIRECT_SIZE%" == "" set bad_env_var=1 if not "%ES_USE_IPV4%" == "" set bad_env_var=1 if not "%ES_GC_OPTS%" == "" set bad_env_var=1 +if not "%ES_GC_LOG_FILE%" == "" set bad_env_var=1 if %bad_env_var% == 1 ( echo Error: encountered environment variables that are no longer supported echo Use jvm.options or ES_JAVA_OPTS to configure the JVM @@ -23,6 +24,7 @@ if %bad_env_var% == 1 ( if not "%ES_DIRECT_SIZE%" == "" echo ES_DIRECT_SIZE=%ES_DIRECT_SIZE%: set -XX:MaxDirectMemorySize=%ES_DIRECT_SIZE% in jvm.options or add "-XX:MaxDirectMemorySize=%ES_DIRECT_SIZE%" to ES_JAVA_OPTS if not "%ES_USE_IPV4%" == "" echo ES_USE_IPV4=%ES_USE_IPV4%: set -Djava.net.preferIPv4Stack=true in jvm.options or add "-Djava.net.preferIPv4Stack=true" to ES_JAVA_OPTS if not "%ES_GC_OPTS%" == "" echo ES_GC_OPTS=%ES_GC_OPTS%: set %ES_GC_OPTS: = and % in jvm.options or add "%ES_GC_OPTS%" to ES_JAVA_OPTS + if not "%ES_GC_LOG_FILE%" == "" echo ES_GC_LOG_FILE=%ES_GC_LOG_FILE%: set -Xloggc:%ES_GC_LOG_FILE% in jvm.options or add "-Xloggc:%ES_GC_LOG_FILE%" to ES_JAVA_OPTS" exit /b 1 ) rem end TODO: remove for Elasticsearch 6.x diff --git a/distribution/src/main/resources/bin/service.bat b/distribution/src/main/resources/bin/service.bat index 9e167e12bee..2519550f4aa 100644 --- a/distribution/src/main/resources/bin/service.bat +++ b/distribution/src/main/resources/bin/service.bat @@ -11,6 +11,7 @@ if not "%ES_HEAP_NEWSIZE%" == "" set bad_env_var=1 if not "%ES_DIRECT_SIZE%" == "" set bad_env_var=1 if not "%ES_USE_IPV4%" == "" set bad_env_var=1 if not "%ES_GC_OPTS%" == "" set bad_env_var=1 +if not "%ES_GC_LOG_FILE%" == "" set bad_env_var=1 if %bad_env_var% == 1 ( echo Error: encountered environment variables that are no longer supported echo Use jvm.options or ES_JAVA_OPTS to configure the JVM @@ -21,6 +22,7 @@ if %bad_env_var% == 1 ( if not "%ES_DIRECT_SIZE%" == "" echo ES_DIRECT_SIZE=%ES_DIRECT_SIZE%: set -XX:MaxDirectMemorySize=%ES_DIRECT_SIZE% in jvm.options or add "-XX:MaxDirectMemorySize=%ES_DIRECT_SIZE%" to ES_JAVA_OPTS if not "%ES_USE_IPV4%" == "" echo ES_USE_IPV4=%ES_USE_IPV4%: set -Djava.net.preferIPv4Stack=true in jvm.options or add "-Djava.net.preferIPv4Stack=true" to ES_JAVA_OPTS if not "%ES_GC_OPTS%" == "" echo ES_GC_OPTS=%ES_GC_OPTS%: set %ES_GC_OPTS: = and % in jvm.options or add "%ES_GC_OPTS%" to ES_JAVA_OPTS + if not "%ES_GC_LOG_FILE%" == "" echo ES_GC_LOG_FILE=%ES_GC_LOG_FILE%: set -Xloggc:%ES_GC_LOG_FILE% in jvm.options or add "-Xloggc:%ES_GC_LOG_FILE%" to ES_JAVA_OPTS" exit /b 1 ) rem end TODO: remove for Elasticsearch 6.x