chukwa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From asrab...@apache.org
Subject svn commit: r781209 - in /hadoop/chukwa/trunk: CHANGES.txt bin/demux.sh bin/dumpArchive.sh bin/dumpDataType.sh bin/dumpRecord.sh bin/jettyCollector.sh bin/postProcess.sh src/java/org/apache/hadoop/chukwa/conf/ChukwaConfiguration.java
Date Tue, 02 Jun 2009 23:21:10 GMT
Author: asrabkin
Date: Tue Jun  2 23:21:09 2009
New Revision: 781209

URL: http://svn.apache.org/viewvc?rev=781209&view=rev
Log:
CHUKWA-216. postProcess.sh should use HADOOP_CONF_DIR to find hadoop-site.xml.  Contributed
by Jerome Boulon

Modified:
    hadoop/chukwa/trunk/CHANGES.txt
    hadoop/chukwa/trunk/bin/demux.sh
    hadoop/chukwa/trunk/bin/dumpArchive.sh
    hadoop/chukwa/trunk/bin/dumpDataType.sh
    hadoop/chukwa/trunk/bin/dumpRecord.sh
    hadoop/chukwa/trunk/bin/jettyCollector.sh
    hadoop/chukwa/trunk/bin/postProcess.sh
    hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/conf/ChukwaConfiguration.java

Modified: hadoop/chukwa/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/CHANGES.txt?rev=781209&r1=781208&r2=781209&view=diff
==============================================================================
--- hadoop/chukwa/trunk/CHANGES.txt (original)
+++ hadoop/chukwa/trunk/CHANGES.txt Tue Jun  2 23:21:09 2009
@@ -28,6 +28,8 @@
 
   BUG FIXES
 
+    CHUKWA-216. postProcess.sh should use HADOOP_CONF_DIR to find hadoop-site.xml. (Jerome
Boulon via asrabkin)
+
     CHUKWA-261. Added X axis label for non Time Series graphs. (Eric Yang)
 
 Release 0.1.2 - 2009-05-14

Modified: hadoop/chukwa/trunk/bin/demux.sh
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/bin/demux.sh?rev=781209&r1=781208&r2=781209&view=diff
==============================================================================
--- hadoop/chukwa/trunk/bin/demux.sh (original)
+++ hadoop/chukwa/trunk/bin/demux.sh Tue Jun  2 23:21:09 2009
@@ -75,4 +75,4 @@
  add_cron
  
  # Run Demux
- ${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} -DAPP=demux -Dlog4j.configuration=chukwa-log4j.properties
-classpath ${CLASSPATH}:${CHUKWA_CORE}:${HADOOP_JAR}:${COMMON}:${tools}:${CHUKWA_CONF_DIR}
org.apache.hadoop.chukwa.extraction.demux.DemuxManager 
+ ${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} -DAPP=demux -Dlog4j.configuration=chukwa-log4j.properties
-classpath ${CHUKWA_CONF_DIR}:${HADOOP_CONF_DIR}:${CLASSPATH}:${CHUKWA_CORE}:${HADOOP_JAR}:${COMMON}:${tools}
org.apache.hadoop.chukwa.extraction.demux.DemuxManager 

Modified: hadoop/chukwa/trunk/bin/dumpArchive.sh
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/bin/dumpArchive.sh?rev=781209&r1=781208&r2=781209&view=diff
==============================================================================
--- hadoop/chukwa/trunk/bin/dumpArchive.sh (original)
+++ hadoop/chukwa/trunk/bin/dumpArchive.sh Tue Jun  2 23:21:09 2009
@@ -21,4 +21,4 @@
 
 . "$bin"/chukwa-config.sh
 
-${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
+${JAVA_HOME}/bin/java -Djava.library.path=${JAVA_LIBRARY_PATH} -DCHUKWA_CONF_DIR=${CHUKWA_CONF_DIR}
-classpath ${CHUKWA_CONF_DIR}:${HADOOP_CONF_DIR}:${CLASSPATH}:${CHUKWA_CORE}:${COMMON}:${HADOOP_JAR}
org.apache.hadoop.chukwa.util.DumpArchive $1

Modified: hadoop/chukwa/trunk/bin/dumpDataType.sh
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/bin/dumpDataType.sh?rev=781209&r1=781208&r2=781209&view=diff
==============================================================================
--- hadoop/chukwa/trunk/bin/dumpDataType.sh (original)
+++ hadoop/chukwa/trunk/bin/dumpDataType.sh Tue Jun  2 23:21:09 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.DumpDataType $@
+${JAVA_HOME}/bin/java -DCHUKWA_CONF_DIR=${CHUKWA_CONF_DIR} -classpath ${CHUKWA_CONF_DIR}:${HADOOP_CONF_DIR}:${CLASSPATH}:${CHUKWA_CORE}:${COMMON}:${HADOOP_JAR}
org.apache.hadoop.chukwa.util.DumpDataType $@

Modified: hadoop/chukwa/trunk/bin/dumpRecord.sh
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/bin/dumpRecord.sh?rev=781209&r1=781208&r2=781209&view=diff
==============================================================================
--- hadoop/chukwa/trunk/bin/dumpRecord.sh (original)
+++ hadoop/chukwa/trunk/bin/dumpRecord.sh Tue Jun  2 23:21:09 2009
@@ -21,4 +21,4 @@
 
 . "$bin"/chukwa-config.sh
 
-${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
+${JAVA_HOME}/bin/java -Djava.library.path=${JAVA_LIBRARY_PATH} -DCHUKWA_CONF_DIR=${CHUKWA_CONF_DIR}
-classpath ${CHUKWA_CONF_DIR}:${HADOOP_CONF_DIR}:${CLASSPATH}:${CHUKWA_CORE}:${COMMON}:${HADOOP_JAR}
org.apache.hadoop.chukwa.util.DumpRecord $1

Modified: hadoop/chukwa/trunk/bin/jettyCollector.sh
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/bin/jettyCollector.sh?rev=781209&r1=781208&r2=781209&view=diff
==============================================================================
--- hadoop/chukwa/trunk/bin/jettyCollector.sh (original)
+++ hadoop/chukwa/trunk/bin/jettyCollector.sh Tue Jun  2 23:21:09 2009
@@ -34,4 +34,4 @@
   stop
 fi
 
-exec ${JAVA_HOME}/bin/java -DAPP=collector -Dlog4j.configuration=chukwa-log4j.properties
-DCHUKWA_HOME=${CHUKWA_HOME} -DCHUKWA_CONF_DIR=${CHUKWA_CONF_DIR} -DCHUKWA_LOG_DIR=${CHUKWA_LOG_DIR}
-classpath ${CLASSPATH}:${CHUKWA_CORE}:${COMMON}:${HADOOP_JAR}:${CHUKWA_CONF_DIR} org.apache.hadoop.chukwa.datacollection.collector.CollectorStub
$@
+exec ${JAVA_HOME}/bin/java -DAPP=collector -Dlog4j.configuration=chukwa-log4j.properties
-DCHUKWA_HOME=${CHUKWA_HOME} -DCHUKWA_CONF_DIR=${CHUKWA_CONF_DIR} -DCHUKWA_LOG_DIR=${CHUKWA_LOG_DIR}
-classpath ${CHUKWA_CONF_DIR}:${HADOOP_CONF_DIR}:${CLASSPATH}:${CHUKWA_CORE}:${COMMON}:${HADOOP_JAR}
org.apache.hadoop.chukwa.datacollection.collector.CollectorStub $@

Modified: hadoop/chukwa/trunk/bin/postProcess.sh
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/bin/postProcess.sh?rev=781209&r1=781208&r2=781209&view=diff
==============================================================================
--- hadoop/chukwa/trunk/bin/postProcess.sh (original)
+++ hadoop/chukwa/trunk/bin/postProcess.sh Tue Jun  2 23:21:09 2009
@@ -38,5 +38,5 @@
 fi
 
 # run PosProcessorManager
-${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} -DAPP=postProcess
-Dlog4j.configuration=chukwa-log4j.properties -classpath ${CHUKWA_CONF_DIR}:${CLASSPATH}:${CHUKWA_CORE}:${HADOOP_JAR}:${COMMON}:${tools}
org.apache.hadoop.chukwa.extraction.demux.PostProcessorManager 
+${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} -DAPP=postProcess
-Dlog4j.configuration=chukwa-log4j.properties -classpath ${CHUKWA_CONF_DIR}:${HADOOP_CONF_DIR}:${CLASSPATH}:${CHUKWA_CORE}:${HADOOP_JAR}:${COMMON}:${tools}
org.apache.hadoop.chukwa.extraction.demux.PostProcessorManager 
 

Modified: hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/conf/ChukwaConfiguration.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/conf/ChukwaConfiguration.java?rev=781209&r1=781208&r2=781209&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/conf/ChukwaConfiguration.java (original)
+++ hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/conf/ChukwaConfiguration.java Tue
Jun  2 23:21:09 2009
@@ -50,21 +50,6 @@
 
       log.info("chukwaConf is " + chukwaConf);
 
-      
-      // Hadoop config
-      String hadoopConfDir = System.getenv("HADOOP_CONF_DIR");
-      if (hadoopConfDir != null) {        
-        super.addResource(new Path(hadoopConfDir + "/hadoop-site.xml"));
-        log.debug("added " + hadoopConfDir + "/hadoop-site.xml to ChukwaConfiguration");
-      } else {
-        String hadoopHome = System.getenv("HADOOP_HOME");
-        if (hadoopHome != null) {
-          super.addResource(new Path(hadoopHome + "/conf/hadoop-site.xml"));
-          log.debug("added " + hadoopHome + "/hadoop-site.xml to ChukwaConfiguration");
-        }
-      }
-
-
       super.addResource(new Path(chukwaConf + "/chukwa-agent-conf.xml"));
       log.debug("added chukwa-agent-conf.xml to ChukwaConfiguration");
 



Mime
View raw message