Author: eyang
Date: Fri Feb 27 01:35:59 2009
New Revision: 748372
URL: http://svn.apache.org/viewvc?rev=748372&view=rev
Log:
HADOOP-4839. Added hadoop native library path to JAVA_LIBRARY_PATH.
Modified:
hadoop/core/trunk/src/contrib/chukwa/bin/dumpArchive.sh
hadoop/core/trunk/src/contrib/chukwa/bin/dumpRecord.sh
hadoop/core/trunk/src/contrib/chukwa/bin/processSinkFiles.sh
hadoop/core/trunk/src/contrib/chukwa/conf/chukwa-env.sh
Modified: hadoop/core/trunk/src/contrib/chukwa/bin/dumpArchive.sh
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/chukwa/bin/dumpArchive.sh?rev=748372&r1=748371&r2=748372&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/chukwa/bin/dumpArchive.sh (original)
+++ hadoop/core/trunk/src/contrib/chukwa/bin/dumpArchive.sh Fri Feb 27 01:35:59
2009
@@ -21,4 +21,4 @@
. "$bin"/chukwa-config.sh
-${JAVA_HOME}/bin/java -DCHUKWA_CONF_DIR=${CHUKWA_CONF_DIR} -classpath
${CLASSPATH}:${CHUKWA_CORE}:${COMMON}:${HADOOP_JAR}:${CHUKWA_CONF_DIR}
org.apache.hadoop.chukwa.util.DumpArchive $1
+${JAVA_HOME}/bin/java -Djava.library.path=${JAVA_LIBRARY_PATH}
-DCHUKWA_CONF_DIR=${CHUKWA_CONF_DIR} -classpath
${CLASSPATH}:${CHUKWA_CORE}:${COMMON}:${HADOOP_JAR}:${CHUKWA_CONF_DIR}
org.apache.hadoop.chukwa.util.DumpArchive $1
Modified: hadoop/core/trunk/src/contrib/chukwa/bin/dumpRecord.sh
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/chukwa/bin/dumpRecord.sh?rev=748372&r1=748371&r2=748372&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/chukwa/bin/dumpRecord.sh (original)
+++ hadoop/core/trunk/src/contrib/chukwa/bin/dumpRecord.sh Fri Feb 27 01:35:59
2009
@@ -21,4 +21,4 @@
. "$bin"/chukwa-config.sh
-${JAVA_HOME}/bin/java -DCHUKWA_CONF_DIR=${CHUKWA_CONF_DIR} -classpath
${CLASSPATH}:${CHUKWA_CORE}:${COMMON}:${HADOOP_JAR}:${CHUKWA_CONF_DIR}
org.apache.hadoop.chukwa.util.DumpRecord $1
+${JAVA_HOME}/bin/java -Djava.library.path=${JAVA_LIBRARY_PATH}
-DCHUKWA_CONF_DIR=${CHUKWA_CONF_DIR} -classpath
${CLASSPATH}:${CHUKWA_CORE}:${COMMON}:${HADOOP_JAR}:${CHUKWA_CONF_DIR}
org.apache.hadoop.chukwa.util.DumpRecord $1
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=748372&r1=748371&r2=748372&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/chukwa/bin/processSinkFiles.sh (original)
+++ hadoop/core/trunk/src/contrib/chukwa/bin/processSinkFiles.sh Fri Feb 27
01:35:59 2009
@@ -119,7 +119,7 @@
debugDate=`date `
echo "$debugDate done with demux job" >> "${CHUKWA_LOG_DIR}/mr.log"
- ${JAVA_HOME}/bin/java -DCHUKWA_HOME=${CHUKWA_HOME}
-DCHUKWA_CONF_DIR=${CHUKWA_CONF_DIR} -DCHUKWA_LOG_DIR=${CHUKWA_LOG_DIR}
-Dlog4j.configuration=log4j.properties -classpath
${CLASSPATH}:${CHUKWA_CORE}:${HADOOP_JAR}:${COMMON}:${tools}:${CHUKWA_HOME}/conf
org.apache.hadoop.chukwa.extraction.database.DatabaseLoader
"${srcDoneHdfsDir}/demux" SystemMetrics Df Hadoop_dfs Hadoop_jvm Hadoop_mapred
Hadoop_rpc MSSRGraph MRJobCounters NodeActivity HodJob HodMachine
Hadoop_dfs_FSDirectory Hadoop_dfs_FSNamesystem Hadoop_dfs_datanode
Hadoop_dfs_namenode Hadoop_jvm_metrics Hadoop_mapred_job
Hadoop_mapred_jobtracker Hadoop_mapred_shuffleOutput Hadoop_mapred_tasktracker
Hadoop_rpc_metrics
+ ${JAVA_HOME}/bin/java -Djava.library.path=${JAVA_LIBRARY_PATH}
-DCHUKWA_HOME=${CHUKWA_HOME} -DCHUKWA_CONF_DIR=${CHUKWA_CONF_DIR}
-DCHUKWA_LOG_DIR=${CHUKWA_LOG_DIR} -Dlog4j.configuration=log4j.properties
-classpath
${CLASSPATH}:${CHUKWA_CORE}:${HADOOP_JAR}:${COMMON}:${tools}:${CHUKWA_HOME}/conf
org.apache.hadoop.chukwa.extraction.database.DatabaseLoader
"${srcDoneHdfsDir}/demux" SystemMetrics Df Hadoop_dfs Hadoop_jvm Hadoop_mapred
Hadoop_rpc MSSRGraph MRJobCounters NodeActivity HodJob HodMachine
Hadoop_dfs_FSDirectory Hadoop_dfs_FSNamesystem Hadoop_dfs_datanode
Hadoop_dfs_namenode Hadoop_jvm_metrics Hadoop_mapred_job
Hadoop_mapred_jobtracker Hadoop_mapred_shuffleOutput Hadoop_mapred_tasktracker
Hadoop_rpc_metrics
endDbLoaderTime=`date +%s`
dbLoaderDuration=$(( $endDbLoaderTime - $endDemuxTime))
echo "dbLoaderDuration $dbLoaderDuration" >> "${CHUKWA_LOG_DIR}/mr.log"
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=748372&r1=748371&r2=748372&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/chukwa/conf/chukwa-env.sh (original)
+++ hadoop/core/trunk/src/contrib/chukwa/conf/chukwa-env.sh Fri Feb 27 01:35:59
2009
@@ -39,3 +39,11 @@
# The domain of the cluster
#export DOMAIN=
+
+# Instance name for chukwa deployment
+export CHUKWA_IDENT_STRING=demo
+
+# JAVA LIBRARY PATH for native compression codec
+export JAVA_PLATFORM=Linux-i386-32
+export JAVA_LIBRARY_PATH=${HADOOP_HOME}/lib/native/${JAVA_PLATFORM}
+
