File tree Expand file tree Collapse file tree 1 file changed +7
-0
lines changed Expand file tree Collapse file tree 1 file changed +7
-0
lines changed Original file line number Diff line number Diff line change @@ -5,10 +5,17 @@ current_dir="$(dirname "$0")"
55source " $current_dir /helpers.sh"
66
77ES_HOME=" $current_dir /../../../build/elasticsearch"
8+ ES_DATA_PATH=" /tmp/ls_integration/es-data"
9+ ES_LOGS_PATH=" /tmp/ls_integration/es-logs"
810
911start_es () {
1012 es_args=$@
13+ <<< <<< < HEAD
1114 JAVA_HOME= $ES_HOME /bin/elasticsearch -Epath.data=/tmp/ls_integration/es-data -Epath.logs=/tmp/ls_integration/es-logs $es_args -p $ES_HOME /elasticsearch.pid > /tmp/elasticsearch.log 2> /dev/null &
15+ =======
16+ mkdir -p $ES_DATA_PATH $ES_LOGS_PATH
17+ JAVA_HOME= $ES_HOME /bin/elasticsearch -Expack.security.enabled=false -Epath.data=$ES_DATA_PATH -Ediscovery.type=single-node -Epath.logs=$ES_LOGS_PATH $es_args -p $ES_HOME /elasticsearch.pid > /tmp/elasticsearch.log 2> /dev/null &
18+ >>>>>>> 8e6e183ad (Ensure elasticsearch logs and data dirs exist before startup (# 17531))
1219 count=120
1320 echo " Waiting for elasticsearch to respond..."
1421 while ! curl --silent localhost:9200 && [[ $count -ne 0 ]]; do
You can’t perform that action at this time.
0 commit comments