diff options
| author | Rajendra Gokhale <rvg@cloudera.com> | 2014-10-03 11:58:26 -0700 |
|---|---|---|
| committer | Roman Shaposhnik <rvs@apache.org> | 2014-10-04 13:39:23 -0700 |
| commit | 217a1e0160fd13ef185b6e6b7ff45189456329e0 (patch) | |
| tree | 770d823027da93058000c054f7f12693f9dff3da | |
| parent | add0bad8f57df82fdc9d89e83010eee556a4748a (diff) | |
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).
| -rw-r--r-- | bigtop-packages/src/common/solr/install_solr.sh | 2 | ||||
| -rw-r--r-- | bigtop-packages/src/common/solr/solr.default | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/bigtop-packages/src/common/solr/install_solr.sh b/bigtop-packages/src/common/solr/install_solr.sh index 34e2c9f1..52a65b5e 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 diff --git a/bigtop-packages/src/common/solr/solr.default b/bigtop-packages/src/common/solr/solr.default index 3c73053e..dbd3e72b 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 |