You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by th...@apache.org on 2015/06/17 23:27:10 UTC
svn commit: r1686113 - in /lucene/dev/trunk/solr: CHANGES.txt bin/solr
Author: thelabdude
Date: Wed Jun 17 21:27:10 2015
New Revision: 1686113
URL: http://svn.apache.org/r1686113
Log:
SOLR-7693: Fix the bin/solr -e cloud example to work if lsof is not installed
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=1686113&r1=1686112&r2=1686113&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Wed Jun 17 21:27:10 2015
@@ -159,6 +159,10 @@ Bug Fixes
* SOLR-7682: Schema API: add-copy-field should accept the maxChars parameter. (Steve Rowe)
+* SOLR-7693: Fix the bin/solr -e cloud example to work if lsof is not installed
+ on the local machine by waiting for 10 seconds before starting the second node.
+ (hossman, Timothy Potter)
+
Optimizations
----------------------
* SOLR-7660: Avoid redundant 'exists' calls made to ZK while fetching cluster state updates. (shalin)
Modified: lucene/dev/trunk/solr/bin/solr
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/bin/solr?rev=1686113&r1=1686112&r2=1686113&view=diff
==============================================================================
--- lucene/dev/trunk/solr/bin/solr (original)
+++ lucene/dev/trunk/solr/bin/solr Wed Jun 17 21:27:10 2015
@@ -1416,19 +1416,21 @@ function launch_solr() {
else
echo -e "Still not seeing Solr listening on $SOLR_PORT after 30 seconds!"
tail -30 "$SOLR_LOGS_DIR/solr.log"
- exit
+ exit # subshell!
fi
else
SOLR_PID=`ps auxww | grep start\.jar | grep -w $SOLR_PORT | grep -v grep | awk '{print $2}' | sort -r`
echo -e "\nStarted Solr server on port $SOLR_PORT (pid=$SOLR_PID). Happy searching!\n"
- exit
+ exit # subshell!
fi
done) &
spinner $!
else
+ echo -e "NOTE: Please install lsof as this script needs it to determine if Solr is listening on port $SOLR_PORT."
+ sleep 10
SOLR_PID=`ps auxww | grep start\.jar | grep -w $SOLR_PORT | grep -v grep | awk '{print $2}' | sort -r`
echo -e "\nStarted Solr server on port $SOLR_PORT (pid=$SOLR_PID). Happy searching!\n"
- exit;
+ return;
fi
fi
}