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

SOLR-8107: bin/solr -f should use exec to start the JVM 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1708700 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Timothy Potter 2015-10-14 21:51:56 +00:00
parent a918ee57a6
commit 673654321b
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/CHANGES.txt
View File

@ -269,6 +269,8 @@ Bug Fixes
* SOLR-8152: Overseer Task Processor/Queue can miss responses, leading to timeouts. * SOLR-8152: Overseer Task Processor/Queue can miss responses, leading to timeouts.
(Gregory Chanan) (Gregory Chanan)
* SOLR-8107: bin/solr -f should use exec to start the JVM (Martijn Koster via Timothy Potter)
Optimizations Optimizations
---------------------- ----------------------

2
solr/bin/solr
View File

@ -1308,7 +1308,7 @@ function launch_solr() {
if [ "$run_in_foreground" == "true" ]; then if [ "$run_in_foreground" == "true" ]; then
echo -e "\nStarting Solr$IN_CLOUD_MODE on port $SOLR_PORT from $SOLR_SERVER_DIR\n" echo -e "\nStarting Solr$IN_CLOUD_MODE on port $SOLR_PORT from $SOLR_SERVER_DIR\n"
"$JAVA" "${SOLR_START_OPTS[@]}" $SOLR_ADDL_ARGS -jar start.jar "${SOLR_JETTY_CONFIG[@]}" exec "$JAVA" "${SOLR_START_OPTS[@]}" $SOLR_ADDL_ARGS -jar start.jar "${SOLR_JETTY_CONFIG[@]}"
else else
# run Solr in the background # run Solr in the background
nohup "$JAVA" "${SOLR_START_OPTS[@]}" $SOLR_ADDL_ARGS -jar start.jar \ nohup "$JAVA" "${SOLR_START_OPTS[@]}" $SOLR_ADDL_ARGS -jar start.jar \