Permalink
Browse files

tests: recover from previous server failures !minor

* Use the already-ignored filename pattern for Solr
  server downloads
* Tolerate PID file entries which are no longer running
* Update command-line help
  • Loading branch information...
acdha committed May 27, 2016
1 parent 6cba949 commit 52b296d949e4ae79508a4adfb84928b5b58b8a00
Showing with 4 additions and 3 deletions.
  1. +4 −3 start-solr-test-server.sh
@@ -12,7 +12,7 @@ SOLR_VERSION=4.10.4
ROOT=$(cd `dirname $0`; pwd)
APP=$ROOT/solr-app
PIDS=$ROOT/solr.pids
export SOLR_ARCHIVE="${SOLR_VERSION}.tgz"
export SOLR_ARCHIVE="solr-${SOLR_VERSION}.tgz"
LOGS=$ROOT/logs
cd $ROOT
@@ -127,7 +127,7 @@ function stop_solr() {
echo
if [ -f $PIDS ]; then
echo -n "Stopping Solr.."
xargs kill < $PIDS
xargs kill < $PIDS || true
rm ${PIDS}
echo " stopped"
fi
@@ -149,6 +149,7 @@ function prepare() {
stop_solr
fi
echo "Removing stale working files"
rm -rf $APP
rm -rf $ROOT/solr
rm -rf $LOGS
@@ -167,7 +168,7 @@ function prepare() {
}
if [ $# -eq 0 ]; then
echo "$0 [prepare] [start-simple] [start-cloud] [stop]"
echo "$0 [prepare] [start] [stop]"
exit
fi

0 comments on commit 52b296d

Please sign in to comment.