Author: cdouglas
Date: Tue Feb 10 01:02:17 2009
New Revision: 742809
URL: http://svn.apache.org/viewvc?rev=742809&view=rev
Log:
HADOOP-5148. Fix logic disabling watchdog timer in Chukwa daemon scripts.
Contributed by Ari Rabkin
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/src/contrib/chukwa/bin/chukwa-daemon.sh
hadoop/core/trunk/src/contrib/chukwa/bin/chukwa-daemons.sh
Modified: hadoop/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=742809&r1=742808&r2=742809&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Tue Feb 10 01:02:17 2009
@@ -134,6 +134,9 @@
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
Modified: hadoop/core/trunk/src/contrib/chukwa/bin/chukwa-daemon.sh
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/chukwa/bin/chukwa-daemon.sh?rev=742809&r1=742808&r2=742809&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/chukwa/bin/chukwa-daemon.sh (original)
+++ hadoop/core/trunk/src/contrib/chukwa/bin/chukwa-daemon.sh Tue Feb 10
01:02:17 2009
@@ -105,7 +105,7 @@
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=$?
Modified: hadoop/core/trunk/src/contrib/chukwa/bin/chukwa-daemons.sh
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/chukwa/bin/chukwa-daemons.sh?rev=742809&r1=742808&r2=742809&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/chukwa/bin/chukwa-daemons.sh (original)
+++ hadoop/core/trunk/src/contrib/chukwa/bin/chukwa-daemons.sh Tue Feb 10
01:02:17 2009
@@ -31,7 +31,7 @@
. $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 "$@"
