Export HOSTNAME environment variable
We previously explicitly set the HOSTNAME environment variable so that ${HOSTNAME} could be used a placeholder for defining the node.name in elasticsearch.yml. We removed explicitly setting this because bash defines HOSTNAME. The problem is that bash defines HOSTNAME as a bash variable, not as an environment variable. Therefore, to restore the previous behavior, we export the bash value for HOSTNAME as an environment variable named HOSTNAME. For consistency between Windows and the Unix-like systems, we also define HOSTNAME with a value equal to the environment variable COMPUTERNAME on Windows. Relates #26262
This commit is contained in:
parent
4651920b68
commit
4e97be02a9
|
@ -65,6 +65,8 @@ fi
|
||||||
# check the Java version
|
# check the Java version
|
||||||
"$JAVA" -cp "$ES_CLASSPATH" org.elasticsearch.tools.JavaVersionChecker
|
"$JAVA" -cp "$ES_CLASSPATH" org.elasticsearch.tools.JavaVersionChecker
|
||||||
|
|
||||||
|
export HOSTNAME=$HOSTNAME
|
||||||
|
|
||||||
${source.path.env}
|
${source.path.env}
|
||||||
|
|
||||||
if [ -z "$ES_PATH_CONF" ]; then
|
if [ -z "$ES_PATH_CONF" ]; then
|
||||||
|
|
|
@ -44,6 +44,8 @@ if not "%JAVA_OPTS%" == "" (
|
||||||
rem check the Java version
|
rem check the Java version
|
||||||
%JAVA% -cp "%ES_CLASSPATH%" "org.elasticsearch.tools.JavaVersionChecker" || exit /b 1
|
%JAVA% -cp "%ES_CLASSPATH%" "org.elasticsearch.tools.JavaVersionChecker" || exit /b 1
|
||||||
|
|
||||||
|
set HOSTNAME=%COMPUTERNAME%
|
||||||
|
|
||||||
if "%ES_PATH_CONF%" == "" (
|
if "%ES_PATH_CONF%" == "" (
|
||||||
set ES_PATH_CONF=!ES_HOME!\config
|
set ES_PATH_CONF=!ES_HOME!\config
|
||||||
)
|
)
|
||||||
|
|
|
@ -450,3 +450,15 @@ fi
|
||||||
@test "[$GROUP] test umask" {
|
@test "[$GROUP] test umask" {
|
||||||
install_jvm_example $(readlink -m jvm-example-*.zip) 0077
|
install_jvm_example $(readlink -m jvm-example-*.zip) 0077
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@test "[$GROUP] hostname" {
|
||||||
|
local temp=`mktemp -d`
|
||||||
|
cp "$ESCONFIG"/elasticsearch.yml "$temp"
|
||||||
|
echo 'node.name: ${HOSTNAME}' >> "$ESCONFIG"/elasticsearch.yml
|
||||||
|
start_elasticsearch_service
|
||||||
|
wait_for_elasticsearch_status
|
||||||
|
[ "$(curl -XGET localhost:9200/_cat/nodes?h=name)" == "$HOSTNAME" ]
|
||||||
|
stop_elasticsearch_service
|
||||||
|
cp "$temp"/elasticsearch.yml "$ESCONFIG"/elasticsearch.yml
|
||||||
|
rm -rf "$temp"
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue