Optimized pendingReconstruction not timeout in this case

Author: LiuGuH

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java

@@ -3855,6 +3855,9 @@ private Block addStoredBlock(final BlockInfo block,
     } else {
       updateNeededReconstructions(storedBlock, curReplicaDelta, 0);
     }
+    if (storedBlock.isStriped() && !isNeededReconstruction(storedBlock, num, 0)) {
+      pendingReconstruction.remove(storedBlock);
+    }
     if (shouldProcessExtraRedundancy(num, fileRedundancy)) {
       processExtraRedundancyBlock(storedBlock, fileRedundancy, node,
           delNodeHint);

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

@@ -117,6 +117,7 @@
 import org.apache.hadoop.hdfs.server.blockmanagement.BlockManagerTestUtil;
 import org.apache.hadoop.hdfs.server.blockmanagement.BlockPlacementPolicy;
 import org.apache.hadoop.hdfs.server.blockmanagement.BlockPlacementPolicyRackFaultTolerant;
+import org.apache.hadoop.hdfs.server.common.HdfsServerConstants.BlockUCState;
 import org.apache.hadoop.hdfs.server.datanode.DataNode;
 import org.apache.hadoop.hdfs.server.datanode.DataNodeTestUtils;
 import org.apache.hadoop.hdfs.server.datanode.fsdataset.FsDatasetSpi;
@@ -2808,6 +2809,7 @@ public void testECAddExpectedReplicasToPending() throws Exception {
         for (int i = 0; i < 1024 * 1024; i++) {
           str.write(i);
         }
+        str.flush();
         // Wait for dn2 IBR.
         Thread.sleep(2000);
       }
@@ -2824,25 +2826,11 @@ public void testECAddExpectedReplicasToPending() throws Exception {
       // Wait for dn0 dn1 IBR.
       Thread.sleep(2000);
       pendingNum = BlockManagerTestUtil.getNumReplicasInPendingReconstruction(blockManager,blockInfo);
-      assertEquals(1, pendingNum);
-
-      long timeoutNum = 0;
-      // Wait for pendingReconstruction timeout because the block group only has two replicas.
-      while(timeoutNum == 0) {
-        timeoutNum = blockManager.getNumTimedOutPendingReconstructions();
-      }
-      pendingNum = BlockManagerTestUtil.getNumReplicasInPendingReconstruction(blockManager,blockInfo);
       assertEquals(0, pendingNum);
-      blockInfo = (BlockInfoStriped)blockManager.getStoredBlock(locatedBlocks.getLocatedBlocks().get(0).getBlock().getLocalBlock());
-      assertEquals(2, blockInfo.numNodes());
-
 
-      // Wait for pendingReconstruction timeout blocks to needReconstruction
-      Thread.sleep(3000 * 2);
-      pendingNum = BlockManagerTestUtil.getNumReplicasInPendingReconstruction(blockManager,blockInfo);
-      assertEquals(0, pendingNum);
       blockInfo = (BlockInfoStriped)blockManager.getStoredBlock(locatedBlocks.getLocatedBlocks().get(0).getBlock().getLocalBlock());
       assertEquals(2, blockInfo.numNodes());
+      assertEquals(BlockUCState.COMPLETE, blockInfo.getBlockUCState());
     }
   }