svn commit: r1159029 - in /incubator/chukwa/trunk: ./ hadoop-packaging/ hadoopjars/ ivy/ src/java/org/apache/hadoop/chukwa/inputtools/log4j/ src/java/org/apache/hadoop/mapred/

[ey...@apache.org]

Author: eyang
Date: Thu Aug 18 04:34:10 2011
New Revision: 1159029

URL: http://svn.apache.org/viewvc?rev=1159029&view=rev
Log:
CHUKWA-38.  Download Hadoop jar files from ivy.  (Eric Yang)

Removed:
    incubator/chukwa/trunk/hadoop-packaging/
    incubator/chukwa/trunk/hadoopjars/
Modified:
    incubator/chukwa/trunk/ivy.xml
    incubator/chukwa/trunk/ivy/libraries.properties
    incubator/chukwa/trunk/src/java/org/apache/hadoop/chukwa/inputtools/log4j/Log4JMetricsContext.java
    incubator/chukwa/trunk/src/java/org/apache/hadoop/mapred/ChukwaJobTrackerInstrumentation.java

Modified: incubator/chukwa/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/ivy.xml?rev=1159029&r1=1159028&r2=1159029&view=diff
==============================================================================
--- incubator/chukwa/trunk/ivy.xml (original)
+++ incubator/chukwa/trunk/ivy.xml Thu Aug 18 04:34:10 2011
@@ -53,14 +53,14 @@
     <artifact conf="master"/>
   </publications>
   <dependencies>
-<!--    <dependency org="org.apache.hadoop"
+    <dependency org="org.apache.hadoop"
       name="hadoop-core"
       rev="${hadoop.version}"
       conf="common->master"/>
     <dependency org="org.apache.hadoop"
       name="hadoop-test"
       rev="${hadoop.version}"
-      conf="common->master"/> -->
+      conf="common->master"/>
     <dependency org="com.googlecode.json-simple"
       name="json-simple"
       rev="${json-simple.version}"

Modified: incubator/chukwa/trunk/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/ivy/libraries.properties?rev=1159029&r1=1159028&r2=1159029&view=diff
==============================================================================
--- incubator/chukwa/trunk/ivy/libraries.properties (original)
+++ incubator/chukwa/trunk/ivy/libraries.properties Thu Aug 18 04:34:10 2011
@@ -15,7 +15,7 @@
 
 
 #This properties file lists the versions of the various artifacts used by chukwa.
-#hadoop.version=0.20.3
+hadoop.version=0.20.203.0
 
 #These are the versions of our dependencies
 activemq.version=5.3.1

Modified: incubator/chukwa/trunk/src/java/org/apache/hadoop/chukwa/inputtools/log4j/Log4JMetricsContext.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/java/org/apache/hadoop/chukwa/inputtools/log4j/Log4JMetricsContext.java?rev=1159029&r1=1159028&r2=1159029&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/java/org/apache/hadoop/chukwa/inputtools/log4j/Log4JMetricsContext.java (original)
+++ incubator/chukwa/trunk/src/java/org/apache/hadoop/chukwa/inputtools/log4j/Log4JMetricsContext.java Thu Aug 18 04:34:10 2011
@@ -35,6 +35,10 @@ import org.apache.hadoop.metrics.spi.Out
 import org.apache.log4j.Logger;
 import org.apache.log4j.PatternLayout;
 import org.json.simple.JSONObject;
+import java.util.TreeMap;
+import java.util.Map;
+import java.util.Collection;
+import java.util.List;
 
 public class Log4JMetricsContext extends AbstractMetricsContext {
   Logger log = Logger.getLogger(Log4JMetricsContext.class);
@@ -117,4 +121,22 @@ public class Log4JMetricsContext extends
       out.info(json.toString());
     }
   }
+
+  @Override
+  public synchronized Map<String, Collection<OutputRecord>> getAllRecords() {
+    Map<String, Collection<OutputRecord>> out = new TreeMap<String, Collection<OutputRecord>>();
+/*    for (String recordName : bufferedData.keySet()) {
+      RecordMap recordMap = bufferedData.get(recordName);
+      synchronized (recordMap) {
+        List<OutputRecord> records = new ArrayList<OutputRecord>();
+        Set<Entry<TagMap, MetricMap>> entrySet = recordMap.entrySet();
+        for (Entry<TagMap, MetricMap> entry : entrySet) {
+          OutputRecord outRec = new OutputRecord(entry.getKey(), entry.getValue());
+          records.add(outRec);
+        }
+        out.put(recordName, records);
+      }
+    }*/
+    return out;
+  }
 }

Modified: incubator/chukwa/trunk/src/java/org/apache/hadoop/mapred/ChukwaJobTrackerInstrumentation.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/java/org/apache/hadoop/mapred/ChukwaJobTrackerInstrumentation.java?rev=1159029&r1=1159028&r2=1159029&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/java/org/apache/hadoop/mapred/ChukwaJobTrackerInstrumentation.java (original)
+++ incubator/chukwa/trunk/src/java/org/apache/hadoop/mapred/ChukwaJobTrackerInstrumentation.java Thu Aug 18 04:34:10 2011
@@ -31,7 +31,7 @@ import org.apache.hadoop.chukwa.datacoll
 import org.apache.hadoop.fs.Path;
 
 public class ChukwaJobTrackerInstrumentation extends
-    org.apache.hadoop.mapred.JobTrackerMetricsInst {
+    org.apache.hadoop.mapred.JobTrackerInstrumentation {
 
   protected final JobTracker tracker;
   private static ChukwaAgentController chukwaClient = null;