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

SOLR-7635: Limit lsof port check in bin/solr to just listening ports 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1685296 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Ramkumar Aiyengar 2015-06-13 18:03:01 +00:00
parent d7996c5583
commit 859415c7e1
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -129,6 +129,9 @@ Bug Fixes
* SOLR-7667: Add missing _root_ field to managed-schema template so that the default data driven * SOLR-7667: Add missing _root_ field to managed-schema template so that the default data driven
config set can index nested documents by default. (yonik) config set can index nested documents by default. (yonik)
* SOLR-7635: Limit lsof port check in bin/solr to just listening ports
(Upayavira, Ramkumar Aiyengar)
Optimizations Optimizations
---------------------- ----------------------
* SOLR-7660: Avoid redundant 'exists' calls made to ZK while fetching cluster state updates. (shalin) * SOLR-7660: Avoid redundant 'exists' calls made to ZK while fetching cluster state updates. (shalin)

4
solr/bin/solr
View File

@ -1011,7 +1011,7 @@ if [ "$EXAMPLE" != "" ]; then
# check to see if something is already bound to that port # check to see if something is already bound to that port
if hash lsof 2>/dev/null ; then # hash returns true if lsof is on the path if hash lsof 2>/dev/null ; then # hash returns true if lsof is on the path
PORT_IN_USE=`lsof -Pni:$CLOUD_PORT` PORT_IN_USE=`lsof -PniTCP:$CLOUD_PORT -sTCP:LISTEN`
if [ "$PORT_IN_USE" != "" ]; then 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 read -e -p "Oops! Looks like port $CLOUD_PORT is already being used by another process. Please choose a different port. " USER_INPUT
else else
@ -1408,7 +1408,7 @@ function launch_solr() {
(loops=0 (loops=0
while true while true
do do
running=`lsof -Pni:$SOLR_PORT` running=`lsof -PniTCP:$SOLR_PORT -sTCP:LISTEN`
if [ -z "$running" ]; then if [ -z "$running" ]; then
if [ $loops -lt 6 ]; then if [ $loops -lt 6 ]; then
sleep 5 sleep 5