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 2015/04/28 16:35:07 UTC
svn commit: r1676547 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/cloud-dev/
Author: markrmiller
Date: Tue Apr 28 14:35:07 2015
New Revision: 1676547
URL: http://svn.apache.org/r1676547
Log:
SOLR-7349: Update cloud-dev scripts for Jetty 9.
Removed:
lucene/dev/branches/branch_5x/solr/cloud-dev/solrcloud-extzk-start.sh
lucene/dev/branches/branch_5x/solr/cloud-dev/solrcloud-multi-start.sh
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/cloud-dev/ (props changed)
lucene/dev/branches/branch_5x/solr/cloud-dev/functions.sh
lucene/dev/branches/branch_5x/solr/cloud-dev/solrcloud-start-existing.sh
lucene/dev/branches/branch_5x/solr/cloud-dev/solrcloud-start.sh
lucene/dev/branches/branch_5x/solr/cloud-dev/stop.sh
Modified: lucene/dev/branches/branch_5x/solr/cloud-dev/functions.sh
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/cloud-dev/functions.sh?rev=1676547&r1=1676546&r2=1676547&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/cloud-dev/functions.sh (original)
+++ lucene/dev/branches/branch_5x/solr/cloud-dev/functions.sh Tue Apr 28 14:35:07 2015
@@ -34,14 +34,14 @@ start() {
setports $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 &
+ java $JAVA_OPTS -Djetty.port=$PORT $OPT -jar start.jar --module=http STOP.PORT=$STOP_PORT STOP.KEY=key jetty.base=. 1>server$1.log 2>&1 &
}
stop() {
echo "Stopping instance $1"
setports $1
cd ../server$1
- java -DSTOP.PORT=$STOP_PORT -DSTOP.KEY=key -jar start.jar --stop
+ java -jar start.jar --module=http STOP.PORT=$STOP_PORT STOP.KEY=key --stop
}
do_kill() {
Modified: lucene/dev/branches/branch_5x/solr/cloud-dev/solrcloud-start-existing.sh
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/cloud-dev/solrcloud-start-existing.sh?rev=1676547&r1=1676546&r2=1676547&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/cloud-dev/solrcloud-start-existing.sh (original)
+++ lucene/dev/branches/branch_5x/solr/cloud-dev/solrcloud-start-existing.sh Tue Apr 28 14:35:07 2015
@@ -20,7 +20,7 @@ cd ..
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>serverzk.log 2>&1 &
+exec -a jettyzk java -Xmx512m $JAVA_OPTS -Djetty.port=$jettyPort -DhostPort=$jettyPort -DzkRun -DzkHost=localhost:9900/$ZK_CHROOT -DzkRunOnly=true -jar start.jar --module=http STOP.PORT=$stopPort STOP.KEY=key jetty.base=. 1>serverzk.log 2>&1 &
cd ..
@@ -32,5 +32,5 @@ do
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>server$i.log 2>&1 &
+ exec -a jetty java -Xmx1g $JAVA_OPTS -Djetty.port=$jettyPort -DzkHost=localhost:9900/$ZK_CHROOT -jar start.jar --module=http STOP.PORT=$stopPort STOP.KEY=key jetty.base=. 1>server$i.log 2>&1 &
done
Modified: lucene/dev/branches/branch_5x/solr/cloud-dev/solrcloud-start.sh
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/cloud-dev/solrcloud-start.sh?rev=1676547&r1=1676546&r2=1676547&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/cloud-dev/solrcloud-start.sh (original)
+++ lucene/dev/branches/branch_5x/solr/cloud-dev/solrcloud-start.sh Tue Apr 28 14:35:07 2015
@@ -1,5 +1,7 @@
#!/bin/bash
+# These scripts are best effort developer scripts. No promises.
+
# To run on hdfs, try something along the lines of:
# export JAVA_OPTS="-Dsolr.directoryFactory=solr.HdfsDirectoryFactory -Dsolr.lock.type=hdfs -Dsolr.hdfs.home=hdfs://localhost:8020/solr -Dsolr.hdfs.confdir=/etc/hadoop_conf/conf"
@@ -35,8 +37,8 @@ rm -r -f build
rm -r -f server/solr/zoo_data
rm -f server/server.log
-ant -f ../build.xml clean
-ant server dist
+#ant -f ../build.xml clean
+#ant server dist
rm -r server/solr-webapp/*
unzip server/webapps/solr.war -d server/solr-webapp/webapp
@@ -54,7 +56,7 @@ rm -r -f serverzk/solr/collection1/core.
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>serverzk.log 2>&1 &
+exec -a jettyzk java -Xmx512m $JAVA_OPTS -Djetty.port=$jettyPort -DhostPort=$jettyPort -DzkRun=localhost:9900/solr -DzkHost=$zkAddress -DzkRunOnly=true -jar start.jar --module=http STOP.PORT=$stopPort STOP.KEY=key jetty.base=. 1>serverzk.log 2>&1 &
cd ..
# upload config files
@@ -68,5 +70,5 @@ do
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>server$i.log 2>&1 &
+ exec -a jetty java -Xmx1g $JAVA_OPTS -DnumShards=$numShards -Djetty.port=$jettyPort -DzkHost=$zkAddress -jar start.jar --module=http STOP.PORT=$stopPort STOP.KEY=key jetty.base=. 1>server$i.log 2>&1 &
done
Modified: lucene/dev/branches/branch_5x/solr/cloud-dev/stop.sh
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/cloud-dev/stop.sh?rev=1676547&r1=1676546&r2=1676547&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/cloud-dev/stop.sh (original)
+++ lucene/dev/branches/branch_5x/solr/cloud-dev/stop.sh Tue Apr 28 14:35:07 2015
@@ -18,7 +18,7 @@ do
stopPort=`expr $baseStopPort + $i`
echo "stopping server$i, stop port is $stopPort"
cd ../server$i
- java -DSTOP.PORT=$stopPort -DSTOP.KEY=key -jar start.jar --stop
+ java -jar start.jar --module=http STOP.PORT=$stopPort STOP.KEY=key --stop
done
@@ -46,7 +46,7 @@ do
done
# stop zk runner
-java -DSTOP.PORT=1313 -DSTOP.KEY=key -jar start.jar --stop
+java -jar start.jar --module=http STOP.PORT=1313 STOP.KEY=key --stop
echo "wait for port to be available: $baseJettyPort"