Only track blocks in RBW state and fix single Javadoc warning

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

@@ -1770,9 +1770,9 @@ public class DFSConfigKeys extends CommonConfigurationKeys {
   /**
    * "dfs.namenode.decommission.track.underconstructionblocks" feature is
    * disabled by default. Enabling this feature will benefit HDFS clusters
-   * with datanode decommissioning operations and HDFS blocks/files held
+   * with datanode decommissioning operations and HDFS blocks held
    * open for extended periods of time. These HDFS clusters will see
-   * reduction in HDFS write failures & HDFS data loss.
+   * reduction in HDFS write failures and HDFS data loss.
    */
   public static final boolean DFS_DECOMMISSION_TRACK_UNDER_CONSTRUCTION_BLOCKS_DEFAULT =
           false;

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

@@ -3731,16 +3731,16 @@ void addStoredBlockUnderConstruction(StatefulBlockInfo ucBlock,
     block.getUnderConstructionFeature().addReplicaIfNotPresent(
         storageInfo, ucBlock.reportedBlock, ucBlock.reportedState);
 
-    // Add replica if appropriate. If the replica was previously corrupt
-    // but now okay, it might need to be updated.
-    if (ucBlock.reportedState == ReplicaState.FINALIZED && (
-        block.findStorageInfo(storageInfo) < 0) || corruptReplicas
-        .isReplicaCorrupt(block, storageInfo.getDatanodeDescriptor())) {
-      addStoredBlock(block, ucBlock.reportedBlock, storageInfo, null, true);
-    } else {
+    if (ucBlock.reportedState == ReplicaState.RBW) {
       // Non-finalized Under Construction blocks are not added to the StorageInfos.
       // They are instead tracked via UnderConstructionBlocks data structure.
       ucBlocks.addUcBlock(storageInfo.getDatanodeDescriptor(), ucBlock.reportedBlock);
+    } else if (ucBlock.reportedState == ReplicaState.FINALIZED && (
+        block.findStorageInfo(storageInfo) < 0) || corruptReplicas
+        .isReplicaCorrupt(block, storageInfo.getDatanodeDescriptor())) {
+      // Add replica if appropriate. If the replica was previously corrupt
+      // but now okay, it might need to be updated.
+      addStoredBlock(block, ucBlock.reportedBlock, storageInfo, null, true);
     }
   }