reset TestDataNodeMetrics

Author: hfutatzhanghb

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMetrics.java

@@ -88,9 +88,9 @@ public void testDataNodeMetrics() throws Exception {
     MiniDFSCluster cluster = new MiniDFSCluster.Builder(conf).build();
     try {
       FileSystem fs = cluster.getFileSystem();
-      final long LONG_FILE_LEN = Integer.MAX_VALUE + 1L;
+      final long LONG_FILE_LEN = Integer.MAX_VALUE+1L;
       DFSTestUtil.createFile(fs, new Path("/tmp.txt"),
-          LONG_FILE_LEN, (short) 1, 1L);
+          LONG_FILE_LEN, (short)1, 1L);
       List<DataNode> datanodes = cluster.getDataNodes();
       assertEquals(datanodes.size(), 1);
       DataNode datanode = datanodes.get(0);
@@ -99,9 +99,7 @@ public void testDataNodeMetrics() throws Exception {
       assertTrue("Expected non-zero number of incremental block reports",
           getLongCounter("IncrementalBlockReportsNumOps", rb) > 0);
     } finally {
-      if (cluster != null) {
-        cluster.shutdown();
-      }
+      if (cluster != null) {cluster.shutdown();}
     }
   }
 
@@ -116,26 +114,24 @@ public void testSendDataPacketMetrics() throws Exception {
       // Create and read a 1 byte file
       Path tmpfile = new Path("/tmp.txt");
       DFSTestUtil.createFile(fs, tmpfile,
-          (long) 1, (short) 1, 1L);
+          (long)1, (short)1, 1L);
       DFSTestUtil.readFile(fs, tmpfile);
       List<DataNode> datanodes = cluster.getDataNodes();
       assertEquals(datanodes.size(), 1);
       DataNode datanode = datanodes.get(0);
       MetricsRecordBuilder rb = getMetrics(datanode.getMetrics().name());
       // Expect 2 packets, 1 for the 1 byte read, 1 for the empty packet
       // signaling the end of the block
-      assertCounter("SendDataPacketTransferNanosNumOps", (long) 2, rb);
-      assertCounter("SendDataPacketBlockedOnNetworkNanosNumOps", (long) 2, rb);
+      assertCounter("SendDataPacketTransferNanosNumOps", (long)2, rb);
+      assertCounter("SendDataPacketBlockedOnNetworkNanosNumOps", (long)2, rb);
       // Wait for at least 1 rollover
       Thread.sleep((interval + 1) * 1000);
       // Check that the sendPacket percentiles rolled to non-zero values
       String sec = interval + "s";
       assertQuantileGauges("SendDataPacketBlockedOnNetworkNanos" + sec, rb);
       assertQuantileGauges("SendDataPacketTransferNanos" + sec, rb);
     } finally {
-      if (cluster != null) {
-        cluster.shutdown();
-      }
+      if (cluster != null) {cluster.shutdown();}
     }
   }
 
@@ -169,9 +165,7 @@ public void testReceivePacketMetrics() throws Exception {
       assertQuantileGauges("FlushNanos" + sec, dnMetrics);
       assertQuantileGauges("FsyncNanos" + sec, dnMetrics);
     } finally {
-      if (cluster != null) {
-        cluster.shutdown();
-      }
+      if (cluster != null) {cluster.shutdown();}
     }
   }
 
@@ -276,8 +270,8 @@ public void testFsDatasetMetrics() throws Exception {
   }
 
   /**
-   * Tests that round-trip acks in a datanode write pipeline are correctly
-   * measured.
+   * Tests that round-trip acks in a datanode write pipeline are correctly 
+   * measured. 
    */
   @Test
   public void testRoundTripAckMetric() throws Exception {
@@ -315,14 +309,14 @@ public void testRoundTripAckMetric() throws Exception {
           break;
         }
       }
-      assertNotNull("Could not find the head of the datanode write pipeline",
+      assertNotNull("Could not find the head of the datanode write pipeline", 
           headNode);
       // Close the file and wait for the metrics to rollover
       Thread.sleep((interval + 1) * 1000);
       // Check the ack was received
       MetricsRecordBuilder dnMetrics = getMetrics(headNode.getMetrics()
           .name());
-      assertTrue("Expected non-zero number of acks",
+      assertTrue("Expected non-zero number of acks", 
           getLongCounter("PacketAckRoundTripTimeNanosNumOps", dnMetrics) > 0);
       assertQuantileGauges("PacketAckRoundTripTimeNanos" + interval
           + "s", dnMetrics);
@@ -333,7 +327,7 @@ public void testRoundTripAckMetric() throws Exception {
     }
   }
 
-  @Test(timeout = 60000)
+  @Test(timeout=60000)
   public void testTimeoutMetric() throws Exception {
     final Configuration conf = new HdfsConfiguration();
     final Path path = new Path("/test");
@@ -387,7 +381,7 @@ public void testTimeoutMetric() throws Exception {
    *
    * @throws Exception
    */
-  @Test(timeout = 120000)
+  @Test(timeout=120000)
   public void testDataNodeTimeSpend() throws Exception {
     Configuration conf = new HdfsConfiguration();
     conf.set(DFSConfigKeys.DFS_METRICS_PERCENTILES_INTERVALS_KEY, "" + 60);
@@ -477,16 +471,16 @@ public void testDatanodeActiveXceiversCount() throws Exception {
 
       MetricsRecordBuilder rb = getMetrics(datanode.getMetrics().name());
       long dataNodeActiveXceiversCount = MetricsAsserts.getIntGauge(
-          "DataNodeActiveXceiversCount", rb);
+              "DataNodeActiveXceiversCount", rb);
       assertEquals(dataNodeActiveXceiversCount, 0);
 
       Path path = new Path("/counter.txt");
       DFSTestUtil.createFile(fs, path, 204800000, (short) 3, Time
-          .monotonicNow());
+              .monotonicNow());
 
       MetricsRecordBuilder rbNew = getMetrics(datanode.getMetrics().name());
       dataNodeActiveXceiversCount = MetricsAsserts.getIntGauge(
-          "DataNodeActiveXceiversCount", rbNew);
+              "DataNodeActiveXceiversCount", rbNew);
       assertTrue(dataNodeActiveXceiversCount >= 0);
     } finally {
       if (cluster != null) {
@@ -573,12 +567,12 @@ public void testDNShouldNotDeleteBlockONTooManyOpenFiles()
           fs.getClient().getLocatedBlocks(p.toString(), 0).get(0).getBlock();
       try {
         new BlockSender(b, 0, -1, false, true, true,
-            cluster.getDataNodes().get(0), null,
-            CachingStrategy.newDefaultStrategy());
+                cluster.getDataNodes().get(0), null,
+                CachingStrategy.newDefaultStrategy());
         fail("Must throw FileNotFoundException");
       } catch (FileNotFoundException fe) {
         assertTrue("Should throw too many open files",
-            fe.getMessage().contains("Too many open files"));
+                fe.getMessage().contains("Too many open files"));
       }
       cluster.triggerHeartbeats(); // IBR delete ack
       //After DN throws too many open files
@@ -593,7 +587,7 @@ public void testDNShouldNotDeleteBlockONTooManyOpenFiles()
   }
 
   private void verifyBlockLocations(DistributedFileSystem fs, Path p,
-                                    int expected) throws IOException, TimeoutException, InterruptedException {
+      int expected) throws IOException, TimeoutException, InterruptedException {
     final LocatedBlock lb =
         fs.getClient().getLocatedBlocks(p.toString(), 0).get(0);
     GenericTestUtils.waitFor(new Supplier<Boolean>() {
@@ -621,8 +615,7 @@ public void testNNRpcMetricsWithNonHA() throws IOException {
   @Test(timeout = 60000)
   public void testSlowMetrics() throws Exception {
     DataNodeFaultInjector dnFaultInjector = new DataNodeFaultInjector() {
-      @Override
-      public void delay() {
+      @Override public void delay() {
         try {
           Thread.sleep(310);
         } catch (InterruptedException e) {
@@ -649,8 +642,7 @@ public void delay() {
       final AtomicInteger x = new AtomicInteger(0);
 
       GenericTestUtils.waitFor(new Supplier<Boolean>() {
-        @Override
-        public Boolean get() {
+        @Override public Boolean get() {
           x.getAndIncrement();
           try {
             DFSTestUtil
@@ -745,7 +737,7 @@ public void testNodeLocalMetrics() throws Exception {
       cluster.waitActive();
       FileSystem fs = cluster.getFileSystem();
       Path testFile = new Path("/testNodeLocalMetrics.txt");
-      DFSTestUtil.createFile(fs, testFile, 10L, (short) 1, 1L);
+      DFSTestUtil.createFile(fs, testFile, 10L, (short)1, 1L);
       DFSTestUtil.readFile(fs, testFile);
       List<DataNode> datanodes = cluster.getDataNodes();
       assertEquals(1, datanodes.size());
@@ -827,4 +819,3 @@ public Boolean get() {
     }
   }
 }
-