Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-7102: bin/solr should activate cloud mode if ZK_HOST is set 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1677925 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Timothy Potter 2015-05-06 05:38:01 +00:00
parent 74ebcfd134
commit 0fa9cf7c5c
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/CHANGES.txt
View File

@ -325,6 +325,8 @@ Other Changes
explicit mappings, with this feature you can now add a list and have the mappings
expanded when the update is applied (Timothy Potter, Vitaliy Zhovtyuk, hossman)
* SOLR-7102: bin/solr should activate cloud mode if ZK_HOST is set (Timothy Potter)
================== 5.1.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release

5
solr/bin/solr
View File

@ -1230,6 +1230,11 @@ else
GC_LOG_OPTS=()
fi
# If ZK_HOST is defined, the assume SolrCloud mode
if [[ -n "$ZK_HOST" ]]; then
SOLR_MODE="solrcloud"
fi
if [ "$SOLR_MODE" == 'solrcloud' ]; then
if [ -z "$ZK_CLIENT_TIMEOUT" ]; then
ZK_CLIENT_TIMEOUT="15000"

2
solr/bin/solr.cmd
View File

@ -784,6 +784,8 @@ IF EXIST "!SOLR_LOGS_DIR!\solr_gc.log" (
move /Y "!SOLR_LOGS_DIR!\solr_gc.log" "!SOLR_LOGS_DIR!\solr_gc_log_!now_ts!"
)
IF NOT "%ZK_HOST%"=="" set SOLR_MODE=solrcloud
IF "%SOLR_MODE%"=="solrcloud" (
IF "%ZK_CLIENT_TIMEOUT%"=="" set "ZK_CLIENT_TIMEOUT=15000"