HADOOP-5148. Fix logic disabling watchdog timer in Chukwa daemon scripts. Contributed by Ari Rabkin

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@742809 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -134,6 +134,9 @@ Trunk (unreleased changes)
     HADOOP-5147. Correct reference to agent list in Chukwa bin scripts. (Ari
     Rabkin via cdouglas)
 
+    HADOOP-5148. Fix logic disabling watchdog timer in Chukwa daemon scripts.
+    (Ari Rabkin via cdouglas)
+
 Release 0.20.0 - Unreleased
 
   INCOMPATIBLE CHANGES

src/contrib/chukwa/bin/chukwa-daemon.sh

@@ -105,7 +105,7 @@ case $startStop in
     else 
         PARTROL_HOUR2=$[${PARTROL_HOUR}+12]
     fi
-    if [ "${WATCHDOG}" != "" ]; then
+    if [ -n "${WATCHDOG}" ]; then
         mkdir -p ${CHUKWA_HOME}/var/tmp >&/dev/null
         crontab -l > ${CHUKWA_HOME}/var/tmp/cron.${CURRENT_DATE}
         crontest=$?

src/contrib/chukwa/bin/chukwa-daemons.sh

@@ -31,7 +31,7 @@ bin=`cd "$bin"; pwd`
 
 . $bin/chukwa-config.sh
 
-if [ ${WATCHDOG}!="" ]; then
+if [ -n ${WATCHDOG} ]; then
   exec "$bin/slaves.sh" --config $CHUKWA_CONF_DIR cd "$CHUKWA_HOME" \; "$bin/chukwa-daemon.sh" --config $CHUKWA_CONF_DIR --watchdog "$@"
 else
   exec "$bin/slaves.sh" --config $CHUKWA_CONF_DIR cd "$CHUKWA_HOME" \; "$bin/chukwa-daemon.sh" --config $CHUKWA_CONF_DIR "$@"