log unexpected transfer rate data

Author: Ravindra Dingankar

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java

@@ -1936,20 +1936,4 @@ public static boolean isParentEntry(final String path, final String parent) {
     return path.charAt(parent.length()) == Path.SEPARATOR_CHAR
         || parent.equals(Path.SEPARATOR);
   }
-
-  /**
-   * Calculate the transfer rate in bytes/second. Return -1 for any negative input.
-   * @param bytes bytes
-   * @param durationMS duration in milliseconds
-   * @return the number of bytes/second of the transfer rate
-  */
-  public static long transferRateBytesPerSecond(long bytes, long durationMS) {
-    if (bytes < 0 || durationMS < 0) {
-      return -1;
-    }
-    if (durationMS == 0) {
-      durationMS = 1;
-    }
-    return bytes * 1000 / durationMS;
-  }
 }

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

@@ -633,7 +633,11 @@ public void readBlock(final ExtendedBlock block,
       datanode.metrics.incrBytesRead((int) read);
       datanode.metrics.incrBlocksRead();
       datanode.metrics.incrTotalReadTime(duration);
-      datanode.metrics.addReadTransferRate(DFSUtil.transferRateBytesPerSecond(read, duration));
+      if (read < 0 || duration <= 0) {
+        LOG.warn("Unexpected value for data transfer bytes={} duration={}", read, duration);
+      } else {
+        datanode.metrics.addReadTransferRate(read * 1000 / duration);  
+      }
     } catch ( SocketException ignored ) {
       LOG.trace("{}:Ignoring exception while serving {} to {}",
           dnR, block, remoteAddress, ignored);
@@ -1124,7 +1128,11 @@ public void copyBlock(final ExtendedBlock block,
       datanode.metrics.incrBytesRead((int) read);
       datanode.metrics.incrBlocksRead();
       datanode.metrics.incrTotalReadTime(duration);
-      datanode.metrics.addReadTransferRate(DFSUtil.transferRateBytesPerSecond(read, duration));
+      if (read < 0 || duration <= 0) {
+        LOG.warn("Unexpected value for data transfer bytes={} duration={}", read, duration);
+      } else {
+        datanode.metrics.addReadTransferRate(read * 1000 / duration);  
+      }
 
       LOG.info("Copied {} to {}", block, peer.getRemoteAddressString());
     } catch (IOException ioe) {

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUtil.java

@@ -1108,12 +1108,4 @@ public void testErrorMessageForInvalidNameservice() throws Exception {
     LambdaTestUtils.intercept(IOException.class, expectedErrorMessage,
         ()->DFSUtil.getNNServiceRpcAddressesForCluster(conf));
   }
-  
-  @Test
-  public void testTransferRateBytesPerSecond() {
-    assertEquals(9830, DFSUtil.transferRateBytesPerSecond(983, 100));
-    assertEquals(983000, DFSUtil.transferRateBytesPerSecond(983, 0));
-    assertEquals(-1, DFSUtil.transferRateBytesPerSecond(-983, 100));
-    assertEquals(-1, DFSUtil.transferRateBytesPerSecond(983, -100));
-  }
 }