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 2014/12/02 18:41:31 UTC
svn commit: r1642963 - in /lucene/dev/trunk/solr/cloud-dev: clean.sh
cli-test-solrcloud-start.sh functions.sh solrcloud-extzk-start.sh
solrcloud-multi-start.sh solrcloud-start-existing.sh solrcloud-start.sh
stop.sh
Author: markrmiller
Date: Tue Dec 2 17:41:30 2014
New Revision: 1642963
URL: http://svn.apache.org/r1642963
Log:
SOLR-6756: A first pass at making the cloud-dev scripts work again.
Modified:
lucene/dev/trunk/solr/cloud-dev/clean.sh
lucene/dev/trunk/solr/cloud-dev/cli-test-solrcloud-start.sh
lucene/dev/trunk/solr/cloud-dev/functions.sh
lucene/dev/trunk/solr/cloud-dev/solrcloud-extzk-start.sh
lucene/dev/trunk/solr/cloud-dev/solrcloud-multi-start.sh
lucene/dev/trunk/solr/cloud-dev/solrcloud-start-existing.sh
lucene/dev/trunk/solr/cloud-dev/solrcloud-start.sh
lucene/dev/trunk/solr/cloud-dev/stop.sh
Modified: lucene/dev/trunk/solr/cloud-dev/clean.sh
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/cloud-dev/clean.sh?rev=1642963&r1=1642962&r2=1642963&view=diff
==============================================================================
--- lucene/dev/trunk/solr/cloud-dev/clean.sh (original)
+++ lucene/dev/trunk/solr/cloud-dev/clean.sh Tue Dec 2 17:41:30 2014
@@ -13,8 +13,8 @@ cd ..
for (( i=1; i <= $numServers; i++ ))
do
- rm -r -f example$i
+ rm -r -f server$i
done
-rm -r -f examplezk
-rm -r -f example-lastlogs
\ No newline at end of file
+rm -r -f serverzk
+rm -r -f server-lastlogs
\ No newline at end of file
Modified: lucene/dev/trunk/solr/cloud-dev/cli-test-solrcloud-start.sh
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/cloud-dev/cli-test-solrcloud-start.sh?rev=1642963&r1=1642962&r2=1642963&view=diff
==============================================================================
--- lucene/dev/trunk/solr/cloud-dev/cli-test-solrcloud-start.sh (original)
+++ lucene/dev/trunk/solr/cloud-dev/cli-test-solrcloud-start.sh Tue Dec 2 17:41:30 2014
@@ -1,51 +1,53 @@
#!/usr/bin/env bash
+# TODO: !OUT OF DATE!
+
cd ..
-rm -r -f example2
-rm -r -f example3
-rm -r -f example4
-rm -r -f example5
-rm -r -f example6
+rm -r -f server2
+rm -r -f server3
+rm -r -f server4
+rm -r -f server5
+rm -r -f server6
rm -r -f dist
rm -r -f build
-rm -r -f example/solr/zoo_data
-rm -r -f example/solr/data
-rm -f example/example.log
+rm -r -f server/solr/zoo_data
+rm -r -f server/solr/data
+rm -f server/server.log
ant example dist
-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
+cp -r -f server server2
+cp -r -f server server3
+cp -r -f server server4
+cp -r -f server server5
+cp -r -f server server6
# first try uploading a conf dir
-java -classpath lib/*:dist/*:build/lucene-libs/* org.apache.solr.cloud.ZkCLI -cmd upconfig -zkhost 127.0.0.1:9983 -confdir example/solr/collection1/conf -confname conf1 -solrhome example/solr -runzk 8983
+java -classpath lib/*:dist/*:build/lucene-libs/* org.apache.solr.cloud.ZkCLI -cmd upconfig -zkhost 127.0.0.1:9983 -confdir server/solr/collection1/conf -confname conf1 -solrhome server/solr -runzk 8983
# upload a second conf set so we avoid single conf auto linking
-java -classpath lib/*:dist/*:build/lucene-libs/* org.apache.solr.cloud.ZkCLI -cmd upconfig -zkhost 127.0.0.1:9983 -confdir example/solr/collection1/conf -confname conf2 -solrhome example/solr -runzk 8983
+java -classpath lib/*:dist/*:build/lucene-libs/* org.apache.solr.cloud.ZkCLI -cmd upconfig -zkhost 127.0.0.1:9983 -confdir server/solr/collection1/conf -confname conf2 -solrhome server/solr -runzk 8983
# now try linking a collection to a conf set
-java -classpath lib/*:dist/*:build/lucene-libs/* org.apache.solr.cloud.ZkCLI -cmd linkconfig -zkhost 127.0.0.1:9983 -collection collection1 -confname conf1 -solrhome example/solr -runzk 8983
+java -classpath lib/*:dist/*:build/lucene-libs/* org.apache.solr.cloud.ZkCLI -cmd linkconfig -zkhost 127.0.0.1:9983 -collection collection1 -confname conf1 -solrhome server/solr -runzk 8983
-cd example
-java -DzkRun -DnumShards=2 -DSTOP.PORT=7983 -DSTOP.KEY=key -jar start.jar 1>example.log 2>&1 &
+cd server
+java -DzkRun -DnumShards=2 -DSTOP.PORT=7983 -DSTOP.KEY=key -jar start.jar 1>server.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 ../server2
+java -Djetty.port=7574 -DzkHost=localhost:9983 -DnumShards=2 -DSTOP.PORT=6574 -DSTOP.KEY=key -jar start.jar 1>server2.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 &
+cd ../server3
+java -Djetty.port=7575 -DzkHost=localhost:9983 -DnumShards=2 -DSTOP.PORT=6575 -DSTOP.KEY=key -jar start.jar 1>server3.log 2>&1 &
-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 ../server4
+java -Djetty.port=7576 -DzkHost=localhost:9983 -DnumShards=2 -DSTOP.PORT=6576 -DSTOP.KEY=key -jar start.jar 1>server4.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 ../server5
+java -Djetty.port=7577 -DzkHost=localhost:9983 -DnumShards=2 -DSTOP.PORT=6577 -DSTOP.KEY=key -jar start.jar 1>server5.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 &
+cd ../server6
+java -Djetty.port=7578 -DzkHost=localhost:9983 -DnumShards=2 -DSTOP.PORT=6578 -DSTOP.KEY=key -jar start.jar 1>server6.log 2>&1 &
Modified: lucene/dev/trunk/solr/cloud-dev/functions.sh
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/cloud-dev/functions.sh?rev=1642963&r1=1642962&r2=1642963&view=diff
==============================================================================
--- lucene/dev/trunk/solr/cloud-dev/functions.sh (original)
+++ lucene/dev/trunk/solr/cloud-dev/functions.sh Tue Dec 2 17:41:30 2014
@@ -9,8 +9,8 @@ rebuild() {
cd ..
rm -r -f dist
rm -r -f build
- rm -r -f example/solr/zoo_data
- rm -f example/example.log
+ rm -r -f server/solr/zoo_data
+ rm -f server/server.log
ant example dist
}
@@ -22,8 +22,8 @@ setports() {
reinstall() {
echo "Reinstalling instance $1"
cd ..
- rm -rf example$1
- cp -r -f example example$1
+ rm -rf server$1
+ cp -r -f server server$1
}
start() {
@@ -33,14 +33,14 @@ start() {
echo "Starting instance $1"
setports $1
- cd ../example$1
- java $JAVA_OPTS -Djetty.port=$PORT $OPT -DSTOP.PORT=$STOP_PORT -DSTOP.KEY=key -jar start.jar 1>example$1.log 2>&1 &
+ cd ../server$1
+ java $JAVA_OPTS -Djetty.port=$PORT $OPT -DSTOP.PORT=$STOP_PORT -DSTOP.KEY=key -jar start.jar 1>server$1.log 2>&1 &
}
stop() {
echo "Stopping instance $1"
setports $1
- cd ../example$1
+ cd ../server$1
java -DSTOP.PORT=$STOP_PORT -DSTOP.KEY=key -jar start.jar --stop
}
@@ -61,13 +61,13 @@ status() {
}
cleanlogs() {
- cd ../example$1
- mv example$1.log example$1.oldlog
+ cd ../server$1
+ mv server$1.log server$1.oldlog
}
taillogs() {
- cd ../example$1
- tail -f example$1.log
+ cd ../server$1
+ tail -f server$1.log
}
createshard() {
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=1642963&r1=1642962&r2=1642963&view=diff
==============================================================================
--- lucene/dev/trunk/solr/cloud-dev/solrcloud-extzk-start.sh (original)
+++ lucene/dev/trunk/solr/cloud-dev/solrcloud-extzk-start.sh Tue Dec 2 17:41:30 2014
@@ -1,45 +1,47 @@
#!/bin/bash
+# TODO: !OUT OF DATE!
+
zkaddress = localhost:2181/solr
cd ..
-rm -r -f example2
-rm -r -f example3
-rm -r -f example4
-rm -r -f example5
-rm -r -f example6
+rm -r -f server2
+rm -r -f server3
+rm -r -f server4
+rm -r -f server5
+rm -r -f server6
rm -r -f dist
rm -r -f build
-rm -r -f example/solr/zoo_data
-rm -r -f example/solr/collection1/data
-rm -f example/example.log
+rm -r -f server/solr/zoo_data
+rm -r -f server/solr/collection1/data
+rm -f server/server.log
ant example dist
-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
+cp -r -f server server2
+cp -r -f server server3
+cp -r -f server server4
+cp -r -f server server5
+cp -r -f server server6
-java -classpath "example/solr-webapp/webapp/WEB-INF/lib/*:example/lib/ext/" org.apache.solr.cloud.ZkController "$zkaddress" 8983 example/solr/conf conf1
+java -classpath "server/solr-webapp/webapp/WEB-INF/lib/*:server/lib/ext/" org.apache.solr.cloud.ZkController "$zkaddress" 8983 server/solr/conf conf1
-cd example
-java -DzkHost="$zkaddress" -DnumShards=2 -DSTOP.PORT=7983 -DSTOP.KEY=key -jar start.jar 1>example.log 2>&1 &
+cd server
+java -DzkHost="$zkaddress" -DnumShards=2 -DSTOP.PORT=7983 -DSTOP.KEY=key -jar start.jar 1>server.log 2>&1 &
-cd ../example2
-java -Djetty.port=7574 -DzkHost="$zkaddress" -DSTOP.PORT=6574 -DSTOP.KEY=key -jar start.jar 1>example2.log 2>&1 &
+cd ../server2
+java -Djetty.port=7574 -DzkHost="$zkaddress" -DSTOP.PORT=6574 -DSTOP.KEY=key -jar start.jar 1>server2.log 2>&1 &
-cd ../example3
-java -Djetty.port=7575 -DzkHost="$zkaddress" -DSTOP.PORT=6575 -DSTOP.KEY=key -jar start.jar 1>example3.log 2>&1 &
+cd ../server3
+java -Djetty.port=7575 -DzkHost="$zkaddress" -DSTOP.PORT=6575 -DSTOP.KEY=key -jar start.jar 1>server3.log 2>&1 &
-cd ../example4
-java -Djetty.port=7576 -DzkHost="$zkaddress" -DSTOP.PORT=6576 -DSTOP.KEY=key -jar start.jar 1>example4.log 2>&1 &
+cd ../server4
+java -Djetty.port=7576 -DzkHost="$zkaddress" -DSTOP.PORT=6576 -DSTOP.KEY=key -jar start.jar 1>server4.log 2>&1 &
-cd ../example5
-java -Djetty.port=7577 -DzkHost="$zkaddress" -DSTOP.PORT=6577 -DSTOP.KEY=key -jar start.jar 1>example5.log 2>&1 &
+cd ../server5
+java -Djetty.port=7577 -DzkHost="$zkaddress" -DSTOP.PORT=6577 -DSTOP.KEY=key -jar start.jar 1>server5.log 2>&1 &
-cd ../example6
-java -Djetty.port=7578 -DzkHost="$zkaddress" -DSTOP.PORT=6578 -DSTOP.KEY=key -jar start.jar 1>example6.log 2>&1 &
+cd ../server6
+java -Djetty.port=7578 -DzkHost="$zkaddress" -DSTOP.PORT=6578 -DSTOP.KEY=key -jar start.jar 1>server6.log 2>&1 &
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=1642963&r1=1642962&r2=1642963&view=diff
==============================================================================
--- lucene/dev/trunk/solr/cloud-dev/solrcloud-multi-start.sh (original)
+++ lucene/dev/trunk/solr/cloud-dev/solrcloud-multi-start.sh Tue Dec 2 17:41:30 2014
@@ -1,45 +1,47 @@
#!/bin/bash
+# TODO: !OUT OF DATE!
+
# starts up the multicore example
cd ..
-rm -r -f example2
-rm -r -f example3
-rm -r -f example4
-rm -r -f example5
-rm -r -f example6
+rm -r -f server2
+rm -r -f server3
+rm -r -f server4
+rm -r -f server5
+rm -r -f server6
rm -r -f dist
rm -r -f build
-rm -r -f example/solr/zoo_data
-rm -r -f example/solr/collection1/data
-rm -f example/example.log
+rm -r -f server/solr/zoo_data
+rm -r -f server/solr/collection1/data
+rm -f server/server.log
ant example dist
-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
+cp -r -f server server2
+cp -r -f server server3
+cp -r -f server server4
+cp -r -f server server5
+cp -r -f server server6
-java -classpath "example/solr-webapp/webapp/WEB-INF/lib/*:example/lib/ext/" org.apache.solr.cloud.ZkCLI -cmd upconf -zkhost 127.0.0.1:9983 -solrhome example/multicore -runzk 8983
+java -classpath "server/solr-webapp/webapp/WEB-INF/lib/*:server/lib/ext/" org.apache.solr.cloud.ZkCLI -cmd upconf -zkhost 127.0.0.1:9983 -solrhome example/multicore -runzk 8983
-cd example
-java -DzkRun -DnumShards=2 -DSTOP.PORT=7983 -DSTOP.KEY=key -Dsolr.solr.home=multicore -jar start.jar 1>example.log 2>&1 &
+cd server
+java -DzkRun -DnumShards=2 -DSTOP.PORT=7983 -DSTOP.KEY=key -Dsolr.solr.home=../example/multicore -jar start.jar 1>server.log 2>&1 &
-cd ../example2
-java -Djetty.port=7574 -DzkHost=localhost:9983 -DnumShards=2 -DSTOP.PORT=6574 -DSTOP.KEY=key -Dsolr.solr.home=multicore -jar start.jar 1>example2.log 2>&1 &
+cd ../server2
+java -Djetty.port=7574 -DzkHost=localhost:9983 -DnumShards=2 -DSTOP.PORT=6574 -DSTOP.KEY=key -Dsolr.solr.home=multicore -jar start.jar 1>server2.log 2>&1 &
-cd ../example3
-java -Djetty.port=7575 -DzkHost=localhost:9983 -DnumShards=2 -DSTOP.PORT=6575 -DSTOP.KEY=key -Dsolr.solr.home=multicore -jar start.jar 1>example3.log 2>&1 &
+cd ../server3
+java -Djetty.port=7575 -DzkHost=localhost:9983 -DnumShards=2 -DSTOP.PORT=6575 -DSTOP.KEY=key -Dsolr.solr.home=multicore -jar start.jar 1>server3.log 2>&1 &
-cd ../example4
-java -Djetty.port=7576 -DzkHost=localhost:9983 -DnumShards=2 -DSTOP.PORT=6576 -DSTOP.KEY=key -Dsolr.solr.home=multicore -jar start.jar 1>example4.log 2>&1 &
+cd ../server4
+java -Djetty.port=7576 -DzkHost=localhost:9983 -DnumShards=2 -DSTOP.PORT=6576 -DSTOP.KEY=key -Dsolr.solr.home=multicore -jar start.jar 1>server4.log 2>&1 &
-cd ../example5
-java -Djetty.port=7577 -DzkHost=localhost:9983 -DnumShards=2 -DSTOP.PORT=6577 -DSTOP.KEY=key -Dsolr.solr.home=multicore -jar start.jar 1>example5.log 2>&1 &
+cd ../server5
+java -Djetty.port=7577 -DzkHost=localhost:9983 -DnumShards=2 -DSTOP.PORT=6577 -DSTOP.KEY=key -Dsolr.solr.home=multicore -jar start.jar 1>server5.log 2>&1 &
-cd ../example6
-java -Djetty.port=7578 -DzkHost=localhost:9983 -DnumShards=2 -DSTOP.PORT=6578 -DSTOP.KEY=key -Dsolr.solr.home=multicore -jar start.jar 1>example6.log 2>&1 &
+cd ../server6
+java -Djetty.port=7578 -DzkHost=localhost:9983 -DnumShards=2 -DSTOP.PORT=6578 -DSTOP.KEY=key -Dsolr.solr.home=multicore -jar start.jar 1>server6.log 2>&1 &
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=1642963&r1=1642962&r2=1642963&view=diff
==============================================================================
--- lucene/dev/trunk/solr/cloud-dev/solrcloud-start-existing.sh (original)
+++ lucene/dev/trunk/solr/cloud-dev/solrcloud-start-existing.sh Tue Dec 2 17:41:30 2014
@@ -17,20 +17,20 @@ die () {
cd ..
-cd examplezk
+cd serverzk
stopPort=1313
jettyPort=8900
-exec -a jettyzk java -Xmx512m $JAVA_OPTS -Djetty.port=$jettyPort -DhostPort=$jettyPort -DzkRun -DzkHost=localhost:9900/$ZK_CHROOT -DzkRunOnly=true -DSTOP.PORT=$stopPort -DSTOP.KEY=key -jar start.jar 1>examplezk.log 2>&1 &
-# TODO: we could also remove the default core
+exec -a jettyzk java -Xmx512m $JAVA_OPTS -Djetty.port=$jettyPort -DhostPort=$jettyPort -DzkRun -DzkHost=localhost:9900/$ZK_CHROOT -DzkRunOnly=true -DSTOP.PORT=$stopPort -DSTOP.KEY=key -jar start.jar 1>serverzk.log 2>&1 &
+
cd ..
-cd example
+cd server
for (( i=1; i <= $numServers; i++ ))
do
- echo "starting example$i"
- cd ../example$i
+ echo "starting server$i"
+ cd ../server$i
stopPort=`expr $baseStopPort + $i`
jettyPort=`expr $baseJettyPort + $i`
- exec -a jetty java -Xmx1g $JAVA_OPTS -Djetty.port=$jettyPort -DzkHost=localhost:9900/$ZK_CHROOT -DSTOP.PORT=$stopPort -DSTOP.KEY=key -jar start.jar 1>example$i.log 2>&1 &
+ exec -a jetty java -Xmx1g $JAVA_OPTS -Djetty.port=$jettyPort -DzkHost=localhost:9900/$ZK_CHROOT -DSTOP.PORT=$stopPort -DSTOP.KEY=key -jar start.jar 1>server$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=1642963&r1=1642962&r2=1642963&view=diff
==============================================================================
--- lucene/dev/trunk/solr/cloud-dev/solrcloud-start.sh (original)
+++ lucene/dev/trunk/solr/cloud-dev/solrcloud-start.sh Tue Dec 2 17:41:30 2014
@@ -25,52 +25,48 @@ cd ..
for (( i=1; i <= $numServers; i++ ))
do
- rm -r -f example$i
+ echo "try to remove existing directory: server$i"
+ rm -r -f server$i
done
rm -r -f dist
rm -r -f build
-rm -r -f example/solr/zoo_data
-rm -r -f example/solr/collection1/data
-rm -f example/example.log
+rm -r -f server/solr/zoo_data
+rm -f server/server.log
ant -f ../build.xml clean
ant example dist
-rm -r example/solr-webapp/*
-unzip example/webapps/solr.war -d example/solr-webapp/webapp
+rm -r server/solr-webapp/*
+unzip server/webapps/solr.war -d server/solr-webapp/webapp
for (( i=1; i <= $numServers; i++ ))
do
- echo "create example$i"
- cp -r -f example example$i
+ echo "create server$i"
+ cp -r -f server server$i
done
-
-rm -r -f examplezk
-cp -r -f example examplezk
-cp core/src/test-files/solr/solr-no-core.xml examplezk/solr/solr.xml
-rm -r -f examplezk/solr/collection1/core.properties
-cd examplezk
+rm -r -f serverzk
+cp -r -f server serverzk
+cp core/src/test-files/solr/solr-no-core.xml serverzk/solr/solr.xml
+rm -r -f serverzk/solr/collection1/core.properties
+cd serverzk
stopPort=1313
jettyPort=8900
-exec -a jettyzk java -Xmx512m $JAVA_OPTS -Djetty.port=$jettyPort -DhostPort=$jettyPort -DzkRun=localhost:9900/solr -DzkHost=$zkAddress -DzkRunOnly=true -DSTOP.PORT=$stopPort -DSTOP.KEY=key -jar start.jar 1>examplezk.log 2>&1 &
+exec -a jettyzk java -Xmx512m $JAVA_OPTS -Djetty.port=$jettyPort -DhostPort=$jettyPort -DzkRun=localhost:9900/solr -DzkHost=$zkAddress -DzkRunOnly=true -DSTOP.PORT=$stopPort -DSTOP.KEY=key -jar start.jar 1>serverzk.log 2>&1 &
cd ..
# upload config files
-java -classpath "example1/solr-webapp/webapp/WEB-INF/lib/*:example/lib/ext/*" $JAVA_OPTS org.apache.solr.cloud.ZkCLI -cmd bootstrap -zkhost $zkAddress -solrhome example1/solr
+java -classpath "server/solr-webapp/webapp/WEB-INF/lib/*:server/lib/ext/*" $JAVA_OPTS org.apache.solr.cloud.ZkCLI -zkhost $zkAddress -cmd upconfig --confdir server/solr/configsets/basic_configs --confname basic_configs
-cd example
+cd server
for (( i=1; i <= $numServers; i++ ))
do
- echo "starting example$i"
- cd ../example$i
+ echo "starting server$i"
+ cd ../server$i
stopPort=`expr $baseStopPort + $i`
jettyPort=`expr $baseJettyPort + $i`
- exec -a jetty java -Xmx1g $JAVA_OPTS -DnumShards=$numShards -Djetty.port=$jettyPort -DzkHost=$zkAddress -DSTOP.PORT=$stopPort -DSTOP.KEY=key -jar start.jar 1>example$i.log 2>&1 &
+ exec -a jetty java -Xmx1g $JAVA_OPTS -DnumShards=$numShards -Djetty.port=$jettyPort -DzkHost=$zkAddress -DSTOP.PORT=$stopPort -DSTOP.KEY=key -jar start.jar 1>server$i.log 2>&1 &
done
-
-
-
Modified: lucene/dev/trunk/solr/cloud-dev/stop.sh
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/cloud-dev/stop.sh?rev=1642963&r1=1642962&r2=1642963&view=diff
==============================================================================
--- lucene/dev/trunk/solr/cloud-dev/stop.sh (original)
+++ lucene/dev/trunk/solr/cloud-dev/stop.sh Tue Dec 2 17:41:30 2014
@@ -11,22 +11,22 @@ die () {
[ "$#" -eq 1 ] || die "1 argument required, $# provided, usage: stop.sh {numServers}"
-cd ../example
+cd ../server
for (( i=1; i <= $numServers; i++ ))
do
stopPort=`expr $baseStopPort + $i`
- echo "stopping example$i, stop port is $stopPort"
- cd ../example$i
+ echo "stopping server$i, stop port is $stopPort"
+ cd ../server$i
java -DSTOP.PORT=$stopPort -DSTOP.KEY=key -jar start.jar --stop
done
-mkdir ../example-lastlogs
+mkdir ../server-lastlogs
for (( i=1; i <= $numServers; i++ ))
do
- cd ../example$i
+ cd ../server$i
jettyPort=`expr $baseJettyPort + $i`
echo "Make sure jetty stops and wait for it: $jettyPort"
@@ -41,8 +41,8 @@ do
fi
# save the last shutdown logs
- echo "copy example$i.log to lastlogs"
- cp -r -f example$i.log ../example-lastlogs/example-last$i.log
+ echo "copy server$i.log to lastlogs"
+ cp -r -f server$i.log ../server-lastlogs/server-last$i.log
done
# stop zk runner