Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-6592: add mention in solr/CHANGES.txt 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1631462 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Timothy Potter 2014-10-13 16:38:49 +00:00
parent 58a145fbba
commit a5ee2289d4
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -303,6 +303,9 @@ Other Changes
* SOLR-5852: Add CloudSolrServer helper method to connect to a ZK ensemble. (Varun Thacker, Furkan KAMACI, * SOLR-5852: Add CloudSolrServer helper method to connect to a ZK ensemble. (Varun Thacker, Furkan KAMACI,
Shawn Heisey, Mark Miller, Erick Erickson via shalin) Shawn Heisey, Mark Miller, Erick Erickson via shalin)
* SOLR-6592: Avoid waiting for the leader to see the down state if that leader is not live.
(Timothy Potter)
================== 4.10.1 ================== ================== 4.10.1 ==================
Bug Fixes Bug Fixes

6
solr/bin/solr
View File

@ -698,6 +698,12 @@ fi
if [[ "$SCRIPT_CMD" == "start" ]]; then if [[ "$SCRIPT_CMD" == "start" ]]; then
# see if Solr is already running # see if Solr is already running
SOLR_PID=`solr_pid_by_port "$SOLR_PORT"` SOLR_PID=`solr_pid_by_port "$SOLR_PORT"`
if [ "$SOLR_PID" == "" ]; then
# not found using the pid file ... but use ps to ensure not found
SOLR_PID=`ps waux | grep start.jar | grep $SOLR_PORT | grep -v grep | awk '{print $2}' | sort -r`
fi
if [ "$SOLR_PID" != "" ]; then if [ "$SOLR_PID" != "" ]; then
echo -e "\nSolr already running on port $SOLR_PORT (pid: $SOLR_PID)!" echo -e "\nSolr already running on port $SOLR_PORT (pid: $SOLR_PID)!"
echo -e "Please use the 'restart' command if you want to restart this node.\n" echo -e "Please use the 'restart' command if you want to restart this node.\n"