Repository: bigtop Updated Branches: refs/heads/master 4fd59b243 -> 28d4dd2b2
Limit override of JAVA_OPTS in install_solr.sh to cause minimal side-effects Signed-off-by: Mark Grover <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/28d4dd2b Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/28d4dd2b Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/28d4dd2b Branch: refs/heads/master Commit: 28d4dd2b277df6e5f39180ccc1bc42bf8eaca459 Parents: 4fd59b2 Author: Rajendra Gokhale <[email protected]> Authored: Tue Mar 10 14:13:58 2015 -0700 Committer: Mark Grover <[email protected]> Committed: Tue Mar 10 16:37:40 2015 -0700 ---------------------------------------------------------------------- bigtop-packages/src/common/solr/install_solr.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/28d4dd2b/bigtop-packages/src/common/solr/install_solr.sh ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/solr/install_solr.sh b/bigtop-packages/src/common/solr/install_solr.sh index e5b9049..5735d9a 100644 --- a/bigtop-packages/src/common/solr/install_solr.sh +++ b/bigtop-packages/src/common/solr/install_solr.sh @@ -268,9 +268,11 @@ export CATALINA_OPTS="${CATALINA_OPTS} -Dsolr.host=$HOSTNAME -Dsolr.admin.port=$SOLR_ADMIN_PORT -Dsolr.solr.home=$SOLR_HOME" -# FIXME: for some reason catalina doesn't use CATALINA_OPTS for stop action -# and thus doesn't know the admin port -export JAVA_OPTS="$CATALINA_OPTS" +# catalina doesn't use CATALINA_OPTS for stop action so we need to +# set JAVA_OPTS to include the admin port +if [ $1 = "stop" ] ; then + export JAVA_OPTS="$CATALINA_OPTS" +fi if [ -x /usr/lib/bigtop-utils/bigtop-monitor-service ]; then if ([ "$1" = "start" -o "$1" = "run" ]) && [ -n "$SOLRD_WATCHDOG_TIMEOUT" ] ; then
