You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2013/12/23 05:44:26 UTC
svn commit: r1553067 - in /lucene/dev/trunk/solr: cloud-dev/
example/scripts/cloud-scripts/ example/scripts/map-reduce/
Author: markrmiller
Date: Mon Dec 23 04:44:26 2013
New Revision: 1553067
URL: http://svn.apache.org/r1553067
Log:
SOLR-5570: Generalize solrcloud-start.sh solrcloud dev script.
Modified:
lucene/dev/trunk/solr/cloud-dev/cli-test-solrcloud-start.sh (props changed)
lucene/dev/trunk/solr/cloud-dev/control.sh
lucene/dev/trunk/solr/cloud-dev/example1.sh (contents, props changed)
lucene/dev/trunk/solr/cloud-dev/example2.sh (contents, props changed)
lucene/dev/trunk/solr/cloud-dev/example3.sh (contents, props changed)
lucene/dev/trunk/solr/cloud-dev/functions.sh
lucene/dev/trunk/solr/cloud-dev/solrcloud-extzk-start.sh (contents, props changed)
lucene/dev/trunk/solr/cloud-dev/solrcloud-multi-start.sh (contents, props changed)
lucene/dev/trunk/solr/cloud-dev/solrcloud-start-existing.sh (contents, props changed)
lucene/dev/trunk/solr/cloud-dev/solrcloud-start.sh (contents, props changed)
lucene/dev/trunk/solr/cloud-dev/stop.sh (contents, props changed)
lucene/dev/trunk/solr/example/scripts/cloud-scripts/zkcli.sh (props changed)
lucene/dev/trunk/solr/example/scripts/map-reduce/set-map-reduce-classpath.sh (props changed)
Modified: lucene/dev/trunk/solr/cloud-dev/control.sh
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/cloud-dev/control.sh?rev=1553067&r1=1553066&r2=1553067&view=diff
==============================================================================
--- lucene/dev/trunk/solr/cloud-dev/control.sh (original)
+++ lucene/dev/trunk/solr/cloud-dev/control.sh Mon Dec 23 04:44:26 2013
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash
+#!/bin/bash
+
source ./functions.sh
case "$1" in
Modified: lucene/dev/trunk/solr/cloud-dev/example1.sh
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/cloud-dev/example1.sh?rev=1553067&r1=1553066&r2=1553067&view=diff
==============================================================================
--- lucene/dev/trunk/solr/cloud-dev/example1.sh (original)
+++ lucene/dev/trunk/solr/cloud-dev/example1.sh Mon Dec 23 04:44:26 2013
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
cd ..
Modified: lucene/dev/trunk/solr/cloud-dev/example2.sh
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/cloud-dev/example2.sh?rev=1553067&r1=1553066&r2=1553067&view=diff
==============================================================================
--- lucene/dev/trunk/solr/cloud-dev/example2.sh (original)
+++ lucene/dev/trunk/solr/cloud-dev/example2.sh Mon Dec 23 04:44:26 2013
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
cd ..
Modified: lucene/dev/trunk/solr/cloud-dev/example3.sh
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/cloud-dev/example3.sh?rev=1553067&r1=1553066&r2=1553067&view=diff
==============================================================================
--- lucene/dev/trunk/solr/cloud-dev/example3.sh (original)
+++ lucene/dev/trunk/solr/cloud-dev/example3.sh Mon Dec 23 04:44:26 2013
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
cd ..
Modified: lucene/dev/trunk/solr/cloud-dev/functions.sh
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/cloud-dev/functions.sh?rev=1553067&r1=1553066&r2=1553067&view=diff
==============================================================================
--- lucene/dev/trunk/solr/cloud-dev/functions.sh (original)
+++ lucene/dev/trunk/solr/cloud-dev/functions.sh Mon Dec 23 04:44:26 2013
@@ -1,6 +1,6 @@
JAVA_OPTS="-server -Xms256M -Xmx256M"
-BASE_PORT=7570
-BASE_STOP_PORT=6570
+BASE_PORT=7572
+BASE_STOP_PORT=6572
ZK_PORT="9983"
rebuild() {
@@ -16,7 +16,7 @@ rebuild() {
setports() {
if [ "1" = "$1" ]; then
PORT="8983"
- STOP_PORT="7983"
+ STOP_PORT="7983"
else
PORT="$(( $BASE_PORT + $1 ))"
STOP_PORT="$(( $BASE_STOP_PORT + $1 ))"
Modified: lucene/dev/trunk/solr/cloud-dev/solrcloud-extzk-start.sh
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/cloud-dev/solrcloud-extzk-start.sh?rev=1553067&r1=1553066&r2=1553067&view=diff
==============================================================================
--- lucene/dev/trunk/solr/cloud-dev/solrcloud-extzk-start.sh (original)
+++ lucene/dev/trunk/solr/cloud-dev/solrcloud-extzk-start.sh Mon Dec 23 04:44:26 2013
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
zkaddress = localhost:2181/solr
Modified: lucene/dev/trunk/solr/cloud-dev/solrcloud-multi-start.sh
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/cloud-dev/solrcloud-multi-start.sh?rev=1553067&r1=1553066&r2=1553067&view=diff
==============================================================================
--- lucene/dev/trunk/solr/cloud-dev/solrcloud-multi-start.sh (original)
+++ lucene/dev/trunk/solr/cloud-dev/solrcloud-multi-start.sh Mon Dec 23 04:44:26 2013
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
# starts up the multicore example
Modified: lucene/dev/trunk/solr/cloud-dev/solrcloud-start-existing.sh
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/cloud-dev/solrcloud-start-existing.sh?rev=1553067&r1=1553066&r2=1553067&view=diff
==============================================================================
--- lucene/dev/trunk/solr/cloud-dev/solrcloud-start-existing.sh (original)
+++ lucene/dev/trunk/solr/cloud-dev/solrcloud-start-existing.sh Mon Dec 23 04:44:26 2013
@@ -1,21 +1,29 @@
-#!/usr/bin/env bash
+#!/bin/bash
-cd ..
+numServers=$1
+baseJettyPort=7572
+baseStopPort=6572
+
+die () {
+ echo >&2 "$@"
+ exit 1
+}
-cd example
-java -DzkRun -DSTOP.PORT=7983 -DSTOP.KEY=key -jar start.jar 1>example.log 2>&1 &
+[ "$#" -eq 1 ] || die "1 argument required, $# provided, usage: solrcloud-start-exisiting.sh {numServers}"
-cd ../example2
-java -Djetty.port=7574 -DzkHost=localhost:9983 -DSTOP.PORT=6574 -DSTOP.KEY=key -jar start.jar 1>example2.log 2>&1 &
-cd ../example3
-java -Djetty.port=7575 -DzkHost=localhost:9983 -DSTOP.PORT=6575 -DSTOP.KEY=key -jar start.jar 1>example3.log 2>&1 &
+cd ..
-cd ../example4
-java -Djetty.port=7576 -DzkHost=localhost:9983 -DSTOP.PORT=6576 -DSTOP.KEY=key -jar start.jar 1>example4.log 2>&1 &
+cd example1
+echo "starting example1"
+java -DzkRun -DSTOP.PORT=7983 -DSTOP.KEY=key -jar start.jar 1>example1.log 2>&1 &
-cd ../example5
-java -Djetty.port=7577 -DzkHost=localhost:9983 -DSTOP.PORT=6577 -DSTOP.KEY=key -jar start.jar 1>example5.log 2>&1 &
-cd ../example6
-java -Djetty.port=7578 -DzkHost=localhost:9983 -DSTOP.PORT=6578 -DSTOP.KEY=key -jar start.jar 1>example6.log 2>&1 &
+for (( i=2; i <= $numServers; i++ ))
+do
+ echo "starting example$i"
+ cd ../example$i
+ stopPort=`expr $baseStopPort + $i`
+ jettyPort=`expr $baseJettyPort + $i`
+ java -Xmx1g -Djetty.port=$jettyPort -DzkHost=localhost:9983 -DnumShards=1 -DSTOP.PORT=$stopPort -DSTOP.KEY=key -jar start.jar 1>example$i.log 2>&1 &
+done
Modified: lucene/dev/trunk/solr/cloud-dev/solrcloud-start.sh
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/cloud-dev/solrcloud-start.sh?rev=1553067&r1=1553066&r2=1553067&view=diff
==============================================================================
--- lucene/dev/trunk/solr/cloud-dev/solrcloud-start.sh (original)
+++ lucene/dev/trunk/solr/cloud-dev/solrcloud-start.sh Mon Dec 23 04:44:26 2013
@@ -1,12 +1,27 @@
-#!/usr/bin/env bash
+#!/bin/bash
+
+numServers=$1
+numShards=$2
+
+baseJettyPort=7572
+baseStopPort=6572
+
+zkaddress = localhost:2181/solr
+
+die () {
+ echo >&2 "$@"
+ exit 1
+}
+
+[ "$#" -eq 2 ] || die "2 arguments required, $# provided, usage: solrcloud-start.sh {numServers} {numShards}"
cd ..
-rm -r -f example2
-rm -r -f example3
-rm -r -f example4
-rm -r -f example5
-rm -r -f example6
+for (( i=1; i <= $numServers; i++ ))
+do
+ rm -r -f example$i
+done
+
rm -r -f dist
rm -r -f build
@@ -19,28 +34,30 @@ ant example dist
rm -r example/solr-webapp/*
unzip example/webapps/solr.war -d example/solr-webapp/webapp
-cp -r -f example example2
-cp -r -f example example3
-cp -r -f example example4
-cp -r -f example example5
-cp -r -f example example6
+for (( i=1; i <= $numServers; i++ ))
+do
+ echo "create example$i"
+ cp -r -f example example$i
+done
+
+
+java -classpath "example1/solr-webapp/webapp/WEB-INF/lib/*:example/lib/ext/*" org.apache.solr.cloud.ZkCLI -cmd bootstrap -zkhost 127.0.0.1:9983 -solrhome example1/solr -runzk 8983
+
+echo "starting example1"
-java -classpath "example/solr-webapp/webapp/WEB-INF/lib/*:example/lib/ext/*" org.apache.solr.cloud.ZkCLI -cmd bootstrap -zkhost 127.0.0.1:9983 -solrhome example/solr -runzk 8983
+cd example1
+java -Xmx1g -DzkRun -DnumShards=$numShards -DSTOP.PORT=7983 -DSTOP.KEY=key -jar start.jar 1>example1.log 2>&1 &
-cd example
-java -DzkRun -DnumShards=2 -DSTOP.PORT=7983 -DSTOP.KEY=key -jar start.jar 1>example.log 2>&1 &
-cd ../example2
-java -Djetty.port=7574 -DzkHost=localhost:9983 -DnumShards=2 -DSTOP.PORT=6574 -DSTOP.KEY=key -jar start.jar 1>example2.log 2>&1 &
-cd ../example3
-java -Djetty.port=7575 -DzkHost=localhost:9983 -DnumShards=2 -DSTOP.PORT=6575 -DSTOP.KEY=key -jar start.jar 1>example3.log 2>&1 &
+for (( i=2; i <= $numServers; i++ ))
+do
+ echo "starting example$i"
+ cd ../example$i
+ stopPort=`expr $baseStopPort + $i`
+ jettyPort=`expr $baseJettyPort + $i`
+ java -Xmx1g -Djetty.port=$jettyPort -DzkHost=localhost:9983 -DnumShards=1 -DSTOP.PORT=$stopPort -DSTOP.KEY=key -jar start.jar 1>example$i.log 2>&1 &
+done
-cd ../example4
-java -Djetty.port=7576 -DzkHost=localhost:9983 -DnumShards=2 -DSTOP.PORT=6576 -DSTOP.KEY=key -jar start.jar 1>example4.log 2>&1 &
-cd ../example5
-java -Djetty.port=7577 -DzkHost=localhost:9983 -DnumShards=2 -DSTOP.PORT=6577 -DSTOP.KEY=key -jar start.jar 1>example5.log 2>&1 &
-cd ../example6
-java -Djetty.port=7578 -DzkHost=localhost:9983 -DnumShards=2 -DSTOP.PORT=6578 -DSTOP.KEY=key -jar start.jar 1>example6.log 2>&1 &
Modified: lucene/dev/trunk/solr/cloud-dev/stop.sh
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/cloud-dev/stop.sh?rev=1553067&r1=1553066&r2=1553067&view=diff
==============================================================================
--- lucene/dev/trunk/solr/cloud-dev/stop.sh (original)
+++ lucene/dev/trunk/solr/cloud-dev/stop.sh Mon Dec 23 04:44:26 2013
@@ -1,10 +1,24 @@
-#!/usr/bin/env bash
+#!/bin/bash
+
+numServers=$1
+baseStopPort=6572
+
+die () {
+ echo >&2 "$@"
+ exit 1
+}
+
+[ "$#" -eq 1 ] || die "1 argument required, $# provided, usage: stop.sh {numServers}"
cd ../example
java -DSTOP.PORT=7983 -DSTOP.KEY=key -jar start.jar --stop
-java -DSTOP.PORT=6574 -DSTOP.KEY=key -jar start.jar --stop
-java -DSTOP.PORT=6575 -DSTOP.KEY=key -jar start.jar --stop
-java -DSTOP.PORT=6576 -DSTOP.KEY=key -jar start.jar --stop
-java -DSTOP.PORT=6577 -DSTOP.KEY=key -jar start.jar --stop
-java -DSTOP.PORT=6578 -DSTOP.KEY=key -jar start.jar --stop
\ No newline at end of file
+
+
+for (( i=2; i <= $numServers; i++ ))
+do
+ echo "starting example$i"
+ cd ../example$i
+ stopPort=`expr $baseStopPort + $i`
+ java -DSTOP.PORT=$stopPort -DSTOP.KEY=key -jar start.jar --stop
+done