svn commit: r1677925 - in /lucene/dev/trunk/solr: CHANGES.txt bin/solr bin/solr.cmd

[th...@apache.org]

Author: thelabdude
Date: Wed May  6 05:38:01 2015
New Revision: 1677925

URL: http://svn.apache.org/r1677925
Log:
SOLR-7102: bin/solr should activate cloud mode if ZK_HOST is set

Modified:
    lucene/dev/trunk/solr/CHANGES.txt
    lucene/dev/trunk/solr/bin/solr
    lucene/dev/trunk/solr/bin/solr.cmd

Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1677925&r1=1677924&r2=1677925&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Wed May  6 05:38:01 2015
@@ -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

Modified: lucene/dev/trunk/solr/bin/solr
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/bin/solr?rev=1677925&r1=1677924&r2=1677925&view=diff
==============================================================================
--- lucene/dev/trunk/solr/bin/solr (original)
+++ lucene/dev/trunk/solr/bin/solr Wed May  6 05:38:01 2015
@@ -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"

Modified: lucene/dev/trunk/solr/bin/solr.cmd
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/bin/solr.cmd?rev=1677925&r1=1677924&r2=1677925&view=diff
==============================================================================
--- lucene/dev/trunk/solr/bin/solr.cmd (original)
+++ lucene/dev/trunk/solr/bin/solr.cmd Wed May  6 05:38:01 2015
@@ -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"