HADOOP-1007. Make names of metrics used in Hadoop unique. Contributed by Nigel.

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@505557 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -32,6 +32,9 @@ Trunk (unreleased changes)
 
  9. HADOOP-761.  Change unit tests to not use /tmp.  (Nigel Daley via cutting)
 
+10. HADOOP-1007. Make names of metrics used in Hadoop unique.
+    (Nigel Daley via cutting)
+
 
 Release 0.11.1 - 2007-02-09
 

src/java/org/apache/hadoop/mapred/MapOutputLocation.java

@@ -228,7 +228,7 @@ class MapOutputLocation implements Writable, MRConstants {
           int len = input.read(buffer);
           while (len > 0) {
             totalBytes += len;
-            shuffleMetrics.incrMetric("input_bytes", len);
+            shuffleMetrics.incrMetric("shuffle_input_bytes", len);
             shuffleMetrics.update();
             output.write(buffer, 0 ,len);
             if (currentThread.isInterrupted()) {

src/java/org/apache/hadoop/mapred/MapTask.java

@@ -71,14 +71,14 @@ class MapTask extends Task {
     }
     
     synchronized void mapInput(int numBytes) {
-        mapInputMetrics.incrMetric("input_records", 1);
-        mapInputMetrics.incrMetric("input_bytes", numBytes);
+        mapInputMetrics.incrMetric("map_input_records", 1);
+        mapInputMetrics.incrMetric("map_input_bytes", numBytes);
         mapInputMetrics.update();
     }
     
     synchronized void mapOutput(int numBytes) {
-        mapOutputMetrics.incrMetric("output_records", 1);
-        mapOutputMetrics.incrMetric("output_bytes", numBytes);
+        mapOutputMetrics.incrMetric("map_output_records", 1);
+        mapOutputMetrics.incrMetric("map_output_bytes", numBytes);
         mapOutputMetrics.update();
     }
     

src/java/org/apache/hadoop/mapred/ReduceTask.java

@@ -53,12 +53,12 @@ class ReduceTask extends Task {
     }
     
     synchronized void reduceInput() {
-        inputMetrics.incrMetric("input_records", 1);
+        inputMetrics.incrMetric("reduce_input_records", 1);
         inputMetrics.update();
     }
     
     synchronized void reduceOutput() {
-        outputMetrics.incrMetric("output_records", 1);
+        outputMetrics.incrMetric("reduce_output_records", 1);
         outputMetrics.update();
     }
   }