svn commit: r1676766 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/cloud-dev/ solr/cloud-dev/solrcloud-start-existing.sh solr/cloud-dev/solrcloud-start.sh

[ma...@apache.org]

Author: markrmiller
Date: Wed Apr 29 15:01:09 2015
New Revision: 1676766

URL: http://svn.apache.org/r1676766
Log:
SOLR-7349: Additional updates.

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/solrcloud-start-existing.sh
    lucene/dev/branches/branch_5x/solr/cloud-dev/solrcloud-start.sh

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=1676766&r1=1676765&r2=1676766&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 Wed Apr 29 15:01:09 2015
@@ -17,6 +17,9 @@ die () {
 
 cd ..
 
+# Useful if you want to startup on an existing setup with new code mods
+# ant server dist
+
 cd serverzk
 stopPort=1313
 jettyPort=8900

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=1676766&r1=1676765&r2=1676766&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 Wed Apr 29 15:01:09 2015
@@ -7,6 +7,9 @@
 
 # To use ZooKeeper security, try:
 # export JAVA_OPTS="-DzkACLProvider=org.apache.solr.common.cloud.VMParamsAllAndReadonlyDigestZkACLProvider -DzkCredentialsProvider=org.apache.solr.common.cloud.VMParamsSingleSetCredentialsDigestZkCredentialsProvider -DzkDigestUsername=admin-user -DzkDigestPassword=admin-password -DzkDigestReadonlyUsername=readonly-user -DzkDigestReadonlyPassword=readonly-password"
+#
+# To create a collection, curl "localhost:8901/solr/admin/collections?action=CREATE&name=collection1&numShards=2&replicationFactor=1&maxShardsPerNode=10"
+# To add a document, curl http://localhost:8901/solr/collection1/update -H 'Content-type:application/json' -d '[{"id" : "book1"}]'
 
 numServers=$1
 numShards=$2
@@ -21,7 +24,7 @@ die () {
     exit 1
 }
 
-[ "$#" -eq 2 ] || die "2 arguments required, $# provided, usage: solrcloud-start.sh [numServers] [numShards]"
+[ "$#" -eq 1 ] || die "1 argument required, $# provided, usage: solrcloud-start.sh [numServers]"
 
 cd ..
 
@@ -60,7 +63,7 @@ exec -a jettyzk java -Xmx512m $JAVA_OPTS
 cd ..
 
 # upload config files
-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
+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/conf --confname basic_configs
   
 cd server
 
@@ -70,5 +73,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 -jar start.jar --module=http STOP.PORT=$stopPort STOP.KEY=key jetty.base=. 1>server$i.log 2>&1 &
+  exec -a jetty java -Xmx1g $JAVA_OPTS -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