Supplemental unit tests

Author: yuyanlei-8130

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockManager.java

@@ -2201,4 +2201,76 @@ public void testBlockReportSetNoAckBlockToInvalidate() throws Exception {
       assertEquals(1, getLongCounter("IncrementalBlockReportsNumOps", rb));
     }
   }
+
+  @Test
+  public void testTwoFBRSInARow() throws Exception{
+    DatanodeDescriptor node = spy(nodes.get(0));
+    node.setAlive(true);
+
+    DatanodeRegistration nodeReg =
+            new DatanodeRegistration(node, null, null, "");
+
+    // pretend to be in safemode
+    doReturn(true).when(fsn).isInStartupSafeMode();
+
+    // register new node
+    bm.getDatanodeManager().registerDatanode(nodeReg);
+    bm.getDatanodeManager().addDatanode(node);
+    assertEquals(node, bm.getDatanodeManager().getDatanode(node));
+
+    DatanodeStorageInfo[] storageInfos = node.getStorageInfos();
+    for (int r = 0; r < storageInfos.length; r++) {
+      DatanodeStorageInfo storageInfo = storageInfos[r];
+      assertEquals(0, storageInfo.getBlockReportCount());
+    }
+
+    reset(node);
+    // 1.Here's the original logic
+    BlockReportLeaseManager brlm = new BlockReportLeaseManager(new Configuration());
+    // This is the first FBR
+    for (int r = 0; r < storageInfos.length; r++) {
+      bm.processReport(node, new DatanodeStorage(storageInfos[r].getStorageID()),
+              BlockListAsLongs.EMPTY, null, storageInfos.length, r + 1);
+      //The first FBR times out because the namenode is busy,
+      break;
+    }
+    //and then the second FBR is the same
+    for (int r = 0; r < storageInfos.length; r++) {
+      bm.processReport(node, new DatanodeStorage(storageInfos[r].getStorageID()),
+              BlockListAsLongs.EMPTY, null, storageInfos.length, r + 1);
+      //In the original method, sending FBR twice from one disk will call removeLease
+      brlm.removeLease(node);
+      //Starting from the second disk, FBR will fail because the lease is removed
+      break;
+    }
+
+    assertEquals(2, storageInfos[0].getBlockReportCount());
+    assertEquals(0, storageInfos[1].getBlockReportCount());
+    assertEquals(0, storageInfos[2].getBlockReportCount());
+    assertEquals(0, storageInfos[3].getBlockReportCount());
+    assertEquals(0, storageInfos[4].getBlockReportCount());
+    assertEquals(0, storageInfos[5].getBlockReportCount());
+
+
+    reset(node);
+    //2. Now the processReport method calls removeLease only when it determines that it is the last disk
+    // This is the first FBR
+    for (int r = 0; r < storageInfos.length; r++) {
+      bm.processReport(node, new DatanodeStorage(storageInfos[r].getStorageID()),
+              BlockListAsLongs.EMPTY, null, storageInfos.length, r + 1);
+      //The first FBR times out because the namenode is busy, and then the second FBR is the same
+      break;
+    }
+    for (int r = 0; r < storageInfos.length; r++) {
+      bm.processReport(node, new DatanodeStorage(storageInfos[r].getStorageID()),
+              BlockListAsLongs.EMPTY, null, storageInfos.length, r + 1);
+    }
+
+    assertEquals(2, storageInfos[0].getBlockReportCount());
+    assertEquals(1, storageInfos[1].getBlockReportCount());
+    assertEquals(1, storageInfos[2].getBlockReportCount());
+    assertEquals(1, storageInfos[3].getBlockReportCount());
+    assertEquals(1, storageInfos[4].getBlockReportCount());
+    assertEquals(1, storageInfos[5].getBlockReportCount());
+  }
 }