mirror of https://github.com/apache/lucene.git
SOLR-9508: Install script should check existence of tools, and add option to NOT start service
This commit is contained in:
parent
15cee3141c
commit
b894ab292d
|
@ -149,6 +149,9 @@ Other Changes
|
||||||
* SOLR-9538: Relocate (BinaryResponse|JSON|Smile)Writer tests to org.apache.solr.response
|
* SOLR-9538: Relocate (BinaryResponse|JSON|Smile)Writer tests to org.apache.solr.response
|
||||||
which is the package of the classes they test. (Jonny Marks via Christine Poerschke)
|
which is the package of the classes they test. (Jonny Marks via Christine Poerschke)
|
||||||
|
|
||||||
|
* SOLR-9508: Install script install_solr_service.sh now checks existence of tools.
|
||||||
|
New option -n to avoid starting service after installation (janhoy)
|
||||||
|
|
||||||
================== 6.2.1 ==================
|
================== 6.2.1 ==================
|
||||||
|
|
||||||
Bug Fixes
|
Bug Fixes
|
||||||
|
|
|
@ -27,7 +27,7 @@ print_usage() {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
echo "Usage: install_solr_service.sh path_to_solr_distribution_archive OPTIONS"
|
echo "Usage: install_solr_service.sh <path_to_solr_distribution_archive> [OPTIONS]"
|
||||||
echo ""
|
echo ""
|
||||||
echo " The first argument to the script must be a path to a Solr distribution archive, such as solr-5.0.0.tgz"
|
echo " The first argument to the script must be a path to a Solr distribution archive, such as solr-5.0.0.tgz"
|
||||||
echo " (only .tgz or .zip are supported formats for the archive)"
|
echo " (only .tgz or .zip are supported formats for the archive)"
|
||||||
|
@ -48,10 +48,17 @@ print_usage() {
|
||||||
echo ""
|
echo ""
|
||||||
echo " -f Upgrade Solr. Overwrite symlink and init script of previous installation."
|
echo " -f Upgrade Solr. Overwrite symlink and init script of previous installation."
|
||||||
echo ""
|
echo ""
|
||||||
|
echo " -n Do not start Solr service after install, and do not abort on missing Java"
|
||||||
|
echo ""
|
||||||
echo " NOTE: Must be run as the root user"
|
echo " NOTE: Must be run as the root user"
|
||||||
echo ""
|
echo ""
|
||||||
} # end print_usage
|
} # end print_usage
|
||||||
|
|
||||||
|
print_error() {
|
||||||
|
echo $1
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
proc_version=`cat /etc/*-release 2>/dev/null`
|
proc_version=`cat /etc/*-release 2>/dev/null`
|
||||||
if [[ $? -gt 0 ]]; then
|
if [[ $? -gt 0 ]]; then
|
||||||
if [ -f "/proc/version" ]; then
|
if [ -f "/proc/version" ]; then
|
||||||
|
@ -104,6 +111,7 @@ else
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
SOLR_START=true
|
||||||
if [ $# -gt 1 ]; then
|
if [ $# -gt 1 ]; then
|
||||||
shift
|
shift
|
||||||
while true; do
|
while true; do
|
||||||
|
@ -152,6 +160,10 @@ if [ $# -gt 1 ]; then
|
||||||
SOLR_UPGRADE="YES"
|
SOLR_UPGRADE="YES"
|
||||||
shift 1
|
shift 1
|
||||||
;;
|
;;
|
||||||
|
-n)
|
||||||
|
SOLR_START=false
|
||||||
|
shift 1
|
||||||
|
;;
|
||||||
-help|-usage)
|
-help|-usage)
|
||||||
print_usage ""
|
print_usage ""
|
||||||
exit 0
|
exit 0
|
||||||
|
@ -172,6 +184,19 @@ if [ $# -gt 1 ]; then
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Test for availability of needed tools
|
||||||
|
if [[ $is_tar ]] ; then
|
||||||
|
tar --version &>/dev/null || print_error "Script requires the 'tar' command"
|
||||||
|
else
|
||||||
|
unzip -hh &>/dev/null || print_error "Script requires the 'unzip' command"
|
||||||
|
fi
|
||||||
|
if [[ $SOLR_START == "true" ]] ; then
|
||||||
|
service --version &>/dev/null || print_error "Script requires the 'service' command"
|
||||||
|
java -version &>/dev/null || print_error "Solr requires java, please install or set JAVA_HOME properly"
|
||||||
|
fi
|
||||||
|
lsof -h &>/dev/null || echo "We recommend installing the 'lsof' command for more stable start/stop of Solr"
|
||||||
|
|
||||||
|
|
||||||
if [ -z "$SOLR_EXTRACT_DIR" ]; then
|
if [ -z "$SOLR_EXTRACT_DIR" ]; then
|
||||||
SOLR_EXTRACT_DIR=/opt
|
SOLR_EXTRACT_DIR=/opt
|
||||||
fi
|
fi
|
||||||
|
@ -334,6 +359,10 @@ echo "Service $SOLR_SERVICE installed."
|
||||||
echo "Customize Solr startup configuration in /etc/default/$SOLR_SERVICE.in.sh"
|
echo "Customize Solr startup configuration in /etc/default/$SOLR_SERVICE.in.sh"
|
||||||
|
|
||||||
# start service
|
# start service
|
||||||
service "$SOLR_SERVICE" start
|
if [[ $SOLR_START == "true" ]] ; then
|
||||||
sleep 5
|
service "$SOLR_SERVICE" start
|
||||||
service "$SOLR_SERVICE" status
|
sleep 5
|
||||||
|
service "$SOLR_SERVICE" status
|
||||||
|
else
|
||||||
|
echo "Not starting Solr service (option -n given). Start manually with 'service $SOLR_SERVICE start'"
|
||||||
|
fi
|
||||||
|
|
Loading…
Reference in New Issue