You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2014/10/23 23:45:22 UTC
svn commit: r1633960 - in /lucene/dev/trunk/solr: CHANGES.txt bin/solr
Author: janhoy
Date: Thu Oct 23 21:45:21 2014
New Revision: 1633960
URL: http://svn.apache.org/r1633960
Log:
Start script fails to detect solr on non-default port and then after 30s tails wrong log file
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/bin/solr
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1633960&r1=1633959&r2=1633960&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Thu Oct 23 21:45:21 2014
@@ -259,6 +259,9 @@ Bug Fixes
* SOLR-6224: Post soft-commit callbacks are called before soft commit actually happens.
(shalin)
+* SOLR-6646: bin/solr start script fails to detect solr on non-default port and then after
+ 30s tails wrong log file (janhoy)
+
Optimizations
----------------------
Modified: lucene/dev/trunk/solr/bin/solr
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/bin/solr?rev=1633960&r1=1633959&r2=1633960&view=diff
==============================================================================
--- lucene/dev/trunk/solr/bin/solr (original)
+++ lucene/dev/trunk/solr/bin/solr Thu Oct 23 21:45:21 2014
@@ -317,7 +317,7 @@ function stop_solr() {
SOLR_PID="$4"
if [ "$SOLR_PID" != "" ]; then
- echo -e "Sending stop command to Jetty stop port $STOP_PORT ... waiting 5 seconds to allow process $SOLR_PID to stop gracefully."
+ echo -e "Sending stop command to Solr running on port $SOLR_PORT ... waiting 5 seconds to allow Jetty process $SOLR_PID to stop gracefully."
$JAVA -jar $DIR/start.jar STOP.PORT=$STOP_PORT STOP.KEY=$STOP_KEY --stop || true
(sleep 5) &
spinner $!
@@ -620,7 +620,7 @@ if [ "$EXAMPLE" != "" ]; then
# check to see if something is already bound to that port
if [ "$hasLsof" != "" ]; then
- PORT_IN_USE=`lsof -i:$CLOUD_PORT | grep $CLOUD_PORT`
+ PORT_IN_USE=`lsof -Pni:$CLOUD_PORT`
if [ "$PORT_IN_USE" != "" ]; then
read -e -p "Oops! Looks like port $CLOUD_PORT is already being used by another process. Please choose a different port. " USER_INPUT
else
@@ -898,14 +898,14 @@ $SOLR_HOST_ARG -Djetty.port=$SOLR_PORT \
(loops=0
while true
do
- running=`lsof -i:$SOLR_PORT | grep $SOLR_PORT`
+ running=`lsof -Pni:$SOLR_PORT`
if [ "$running" == "" ]; then
if [ $loops -lt 6 ]; then
sleep 5
loops=$[$loops+1]
else
echo -e "Still not seeing Solr listening on $SOLR_PORT after 30 seconds!"
- tail -30 $SOLR_TIP/node1/logs/solr.log
+ tail -30 $SOLR_SERVER_DIR/logs/solr.log
exit;
fi
else