HADOOP-3340. Fix DFS metrics for BlocksReplicated, HeartbeatsNum, and

BlockReportsAverageTime. Contributed by lohit vijayarenu.



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

CHANGES.txt

@@ -378,6 +378,8 @@ Trunk (unreleased changes)
     HADOOP-3410. Fix KFS implemenation to return correct file
     modification time.  (Sriram Rao via cutting)
 
+    HADOOP-3340. Fix DFS metrics for BlocksReplicated, HeartbeatsNum, and
+    BlockReportsAverageTime. (lohit vijayarenu via cdouglas)
 
 Release 0.17.0 - 2008-05-18
 

src/java/org/apache/hadoop/dfs/DataNode.java

@@ -778,6 +778,7 @@ public class DataNode extends Configured
     case DatanodeProtocol.DNA_TRANSFER:
       // Send a copy of a block to another datanode
       transferBlocks(bcmd.getBlocks(), bcmd.getTargets());
+      myMetrics.blocksReplicated.inc(bcmd.getBlocks().length);
       break;
     case DatanodeProtocol.DNA_INVALIDATE:
       //

src/java/org/apache/hadoop/dfs/datanode/metrics/DataNodeMetrics.java

@@ -132,6 +132,8 @@ public class DataNodeMetrics implements Updater {
       readMetadataOp.pushMetric(metricsRecord);
       copyBlockOp.pushMetric(metricsRecord);
       replaceBlockOp.pushMetric(metricsRecord);
+      heartbeats.pushMetric(metricsRecord);
+      blockReports.pushMetric(metricsRecord);
     }
     metricsRecord.update();
   }
@@ -141,5 +143,7 @@ public class DataNodeMetrics implements Updater {
     readMetadataOp.resetMinMax();
     copyBlockOp.resetMinMax();
     replaceBlockOp.resetMinMax();
+    heartbeats.resetMinMax();
+    blockReports.resetMinMax();
   }
 }