Repository: bigtop Updated Branches: refs/heads/master add0bad8f -> 217a1e016
Changes to start tomcat_watchdog when invoking install_solr.sh with the "start" commandline argument (in a manner analogous to when it is invoked with the "run" argument currently). Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/217a1e01 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/217a1e01 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/217a1e01 Branch: refs/heads/master Commit: 217a1e0160fd13ef185b6e6b7ff45189456329e0 Parents: add0bad Author: Rajendra Gokhale <[email protected]> Authored: Fri Oct 3 11:58:26 2014 -0700 Committer: Roman Shaposhnik <[email protected]> Committed: Sat Oct 4 13:39:23 2014 -0700 ---------------------------------------------------------------------- bigtop-packages/src/common/solr/install_solr.sh | 2 +- bigtop-packages/src/common/solr/solr.default | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/217a1e01/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 34e2c9f..52a65b5 100644 --- a/bigtop-packages/src/common/solr/install_solr.sh +++ b/bigtop-packages/src/common/solr/install_solr.sh @@ -314,7 +314,7 @@ export CATALINA_OPTS="${CATALINA_OPTS} -Dsolr.host=$HOSTNAME # and thus doesn't know the admin port export JAVA_OPTS="$CATALINA_OPTS" -if [ "$1" = "run" -a -n "$SOLRD_WATCHDOG_TIMEOUT" ] ; then +if ([ "$1" = "start" -o "$1" = "run" ]) && [ -n "$SOLRD_WATCHDOG_TIMEOUT" ] ; then tomcat_watchdog & fi http://git-wip-us.apache.org/repos/asf/bigtop/blob/217a1e01/bigtop-packages/src/common/solr/solr.default ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/solr/solr.default b/bigtop-packages/src/common/solr/solr.default index 3c73053..dbd3e72 100644 --- a/bigtop-packages/src/common/solr/solr.default +++ b/bigtop-packages/src/common/solr/solr.default @@ -27,3 +27,4 @@ SOLR_AUTHENTICATION_SIMPLE_ALLOW_ANON=true # SOLR_AUTHENTICATION_KERBEROS_PRINCIPAL=HTTP/localhost@LOCALHOST # SOLR_AUTHENTICATION_KERBEROS_NAME_RULES=DEFAULT # SOLR_AUTHENTICATION_JAAS_CONF=/etc/solr/conf/jaas.conf +SOLRD_WATCHDOG_TIMEOUT=30
