rename metric to ReadTransferRateMBs

Author: Ravindra Dingankar

hadoop-common-project/hadoop-common/src/site/markdown/Metrics.md

@@ -370,7 +370,7 @@ Each metrics record contains tags such as SessionId and Hostname as additional i
 |:---- |:---- |
 | `BytesWritten` | Total number of bytes written to DataNode |
 | `BytesRead` | Total number of bytes read from DataNode |
-| `BytesReadTransferRate`*num*`s(50/75/90/95/99)thPercentileRate` | The 50/75/90/95/99th percentile of the transfer rate of bytes read from the DataNode. The transfer rate is measured in megabytes per second. |
+| `ReadTransferRateMBs`*num*`s(50/75/90/95/99)thPercentileRate` | The 50/75/90/95/99th percentile of the transfer rate of bytes read from the DataNode. The transfer rate is measured in megabytes per second. |
 | `BlocksWritten` | Total number of blocks written to DataNode |
 | `BlocksRead` | Total number of blocks read from DataNode |
 | `BlocksReplicated` | Total number of blocks replicated |

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java

@@ -633,7 +633,7 @@ public void readBlock(final ExtendedBlock block,
       datanode.metrics.incrBytesRead((int) read);
       datanode.metrics.incrBlocksRead();
       datanode.metrics.incrTotalReadTime(duration);
-      datanode.metrics.addBytesReadTransferRate(DFSUtil.transferRateMBs(read, duration));
+      datanode.metrics.addReadTransferRateMBs(DFSUtil.transferRateMBs(read, duration));
     } catch ( SocketException ignored ) {
       LOG.trace("{}:Ignoring exception while serving {} to {}",
           dnR, block, remoteAddress, ignored);
@@ -1124,7 +1124,7 @@ public void copyBlock(final ExtendedBlock block,
       datanode.metrics.incrBytesRead((int) read);
       datanode.metrics.incrBlocksRead();
       datanode.metrics.incrTotalReadTime(duration);
-      datanode.metrics.addBytesReadTransferRate(DFSUtil.transferRateMBs(read, duration));
+      datanode.metrics.addReadTransferRateMBs(DFSUtil.transferRateMBs(read, duration));
 
       LOG.info("Copied {} to {}", block, peer.getRemoteAddressString());
     } catch (IOException ioe) {

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/metrics/DataNodeMetrics.java

@@ -61,8 +61,8 @@ public class DataNodeMetrics {
   @Metric MutableCounterLong bytesRead;
   @Metric("Milliseconds spent reading")
   MutableCounterLong totalReadTime;
-  @Metric MutableRate bytesReadTransferRate;
-  final MutableQuantiles[] bytesReadTransferRateQuantiles;
+  @Metric MutableRate readTransferRateMBs;
+  final MutableQuantiles[] readTransferRateMBsQuantiles;
   @Metric MutableCounterLong blocksWritten;
   @Metric MutableCounterLong blocksRead;
   @Metric MutableCounterLong blocksReplicated;
@@ -229,7 +229,7 @@ public DataNodeMetrics(String name, String sessionId, int[] intervals,
     sendDataPacketTransferNanosQuantiles = new MutableQuantiles[len];
     ramDiskBlocksEvictionWindowMsQuantiles = new MutableQuantiles[len];
     ramDiskBlocksLazyPersistWindowMsQuantiles = new MutableQuantiles[len];
-    bytesReadTransferRateQuantiles = new MutableQuantiles[len];
+    readTransferRateMBsQuantiles = new MutableQuantiles[len];
 
     for (int i = 0; i < len; i++) {
       int interval = intervals[i];
@@ -258,8 +258,8 @@ public DataNodeMetrics(String name, String sessionId, int[] intervals,
           "ramDiskBlocksLazyPersistWindows" + interval + "s",
           "Time between the RamDisk block write and disk persist in ms",
           "ops", "latency", interval);
-      bytesReadTransferRateQuantiles[i] = registry.newQuantiles(
-          "bytesReadTransferRate" + interval + "s",
+      readTransferRateMBsQuantiles[i] = registry.newQuantiles(
+          "readTransferRateMBs" + interval + "s",
           "Rate at which bytes are read from datanode calculated in megabytes per second",
           "ops", "rate", interval);
     }
@@ -323,9 +323,9 @@ public void addIncrementalBlockReport(long latency,
     }
   }
 
-  public void addBytesReadTransferRate(long transferRateMBs) {
-    bytesReadTransferRate.add(transferRateMBs);
-    for (MutableQuantiles q : bytesReadTransferRateQuantiles) {
+  public void addReadTransferRateMBs(long transferRateMBs) {
+    readTransferRateMBs.add(transferRateMBs);
+    for (MutableQuantiles q : readTransferRateMBsQuantiles) {
       q.add(transferRateMBs);
     }
   }