Author: cdouglas
Date: Thu Dec 11 14:03:41 2008
New Revision: 725831
URL: http://svn.apache.org/viewvc?rev=725831&view=rev
Log:
HADOOP-4837. Move HADOOP_CONF_DIR configuration to chukwa-env.sh Contributed by
Jerome Boulon
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/src/contrib/chukwa/bin/processSinkFiles.sh
hadoop/core/trunk/src/contrib/chukwa/conf/chukwa-env.sh
Modified: hadoop/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=725831&r1=725830&r2=725831&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Thu Dec 11 14:03:41 2008
@@ -340,6 +340,9 @@
HADOOP-4805. Remove black list collector from Chukwa Agent HTTP Sender.
(Eric Yang via cdouglas)
+ HADOOP-4837. Move HADOOP_CONF_DIR configuration to chukwa-env.sh (Jerome
+ Boulon via cdouglas)
+
Release 0.19.1 - Unreleased
IMPROVEMENTS
Modified: hadoop/core/trunk/src/contrib/chukwa/bin/processSinkFiles.sh
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/chukwa/bin/processSinkFiles.sh?rev=725831&r1=725830&r2=725831&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/chukwa/bin/processSinkFiles.sh (original)
+++ hadoop/core/trunk/src/contrib/chukwa/bin/processSinkFiles.sh Thu Dec 11
14:03:41 2008
@@ -27,7 +27,6 @@
trap 'remove_cron;rm -f
$CHUKWA_HOME/var/run/chukwa-$CHUKWA_IDENT_STRING-processSinkFiles.sh.pid
${CHUKWA_HOME}/var/run/ProcessSinkFiles.pid; exit 0' 1 2 15
echo "${pid}" > "$CHUKWA_HOME/var/run/ProcessSinkFiles.pid"
-HADOOP_CONF_DIR="${HADOOP_HOME}/conf/"
HADOOP_CMDE="${HADOOP_HOME}/bin/hadoop "
function remove_cron {
Modified: hadoop/core/trunk/src/contrib/chukwa/conf/chukwa-env.sh
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/chukwa/conf/chukwa-env.sh?rev=725831&r1=725830&r2=725831&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/chukwa/conf/chukwa-env.sh (original)
+++ hadoop/core/trunk/src/contrib/chukwa/conf/chukwa-env.sh Thu Dec 11 14:03:41
2008
@@ -11,6 +11,7 @@
# The location of the Hadoop the collector should use. Default
# assumes that this chukwa is living in hadoop's src/contrib directory
export HADOOP_HOME="/usr/lib/hadoop/current"
+export HADOOP_CONF_DIR="${HADOOP_HOME}/conf/"
# The directory where pid files are stored. CHUKWA_HOME/var/run by default.
#export CHUKWA_PID_DIR=
