HDFS-16664. Use correct GenerationStamp when invalidating corrupt block replicas rev4

Author: Kevin Wikant

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

@@ -55,13 +55,21 @@ public enum Reason {
   }
 
   private static class CorruptBlockReplica {
-    public final Reason reason;
-    public final long generationStamp;
+    private final Reason reason;
+    private final long generationStamp;
 
     CorruptBlockReplica(Reason reason, long generationStamp) {
       this.reason = reason;
       this.generationStamp = generationStamp;
     }
+
+    public Reason getReason() {
+      return reason;
+    }
+
+    public long getGenerationStamp() {
+      return generationStamp;
+    }
   }
 
   private final Map<Block, Map<DatanodeDescriptor, CorruptBlockReplica>> corruptReplicasMap =
@@ -144,7 +152,7 @@ boolean removeFromCorruptReplicasMap(
     // if reasons can be compared but don't match, return false.
     CorruptBlockReplica corruptReplica = datanodes.get(datanode);
     if (reason != Reason.ANY && corruptReplica != null &&
-        reason != corruptReplica.reason) {
+        reason != corruptReplica.getReason()) {
       return false;
     }
 
@@ -268,7 +276,7 @@ Long getCorruptReplicaGenerationStamp(Block block, DatanodeDescriptor node) {
     Long generationStamp = null;
     if(corruptReplicasMap.containsKey(block)) {
       if (corruptReplicasMap.get(block).containsKey(node)) {
-        generationStamp = corruptReplicasMap.get(block).get(node).generationStamp;
+        generationStamp = corruptReplicasMap.get(block).get(node).getGenerationStamp();
       }
     }
     return generationStamp;
@@ -285,7 +293,7 @@ String getCorruptReason(Block block, DatanodeDescriptor node) {
     Reason reason = null;
     if(corruptReplicasMap.containsKey(block)) {
       if (corruptReplicasMap.get(block).containsKey(node)) {
-        reason = corruptReplicasMap.get(block).get(node).reason;
+        reason = corruptReplicasMap.get(block).get(node).getReason();
       }
     }
     if (reason != null) {

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

@@ -1915,19 +1915,20 @@ private void createClusterWithDeadNodesDecommissionInProgress(final int numLiveN
   public void testDeleteCorruptReplicaForUnderReplicatedBlock() throws Exception {
     testDeleteCorruptReplicaForUnderReplicatedBlockInternal();
   }
-  
+
   /*
   Same test as testDeleteCorruptReplicaForUnderReplicatedBlock except
   "dfs.namenode.corrupt.block.delete.immediately.enabled = false" such that the block invalidation
   gets postponed.
    */
   @Test(timeout = 60000)
-  public void testDeleteCorruptReplicaForUnderReplicatedBlockWithInvalidationPostponed() throws Exception {
+  public void testDeleteCorruptReplicaForUnderReplicatedBlockWithInvalidationPostponed()
+      throws Exception {
     getConf().setBoolean(DFSConfigKeys.DFS_NAMENODE_CORRUPT_BLOCK_DELETE_IMMEDIATELY_ENABLED,
         false);
     testDeleteCorruptReplicaForUnderReplicatedBlockInternal();
   }
-  
+
   public void testDeleteCorruptReplicaForUnderReplicatedBlockInternal() throws Exception {
     // Constants
     final Path file = new Path("/test-file");

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

@@ -185,15 +185,15 @@ public void testCorruptReplicaInfo()
             crm.getCorruptBlockIdsForTesting(bim, BlockType.STRIPED,
                 10, getStripedBlock(7).getBlockId())));
   }
-  
+
   @Test
   public void testGetCorruptReplicaGenerationStamp() {
     final CorruptReplicasMap crm = new CorruptReplicasMap();
     final DatanodeDescriptor dn1 = DFSTestUtil.getLocalDatanodeDescriptor();
     final DatanodeDescriptor dn2 = DFSTestUtil.getLocalDatanodeDescriptor();
     final long len = 1000L;
     short replFactor = 2;
-    
+
     // Create block replicas with different GenStamps
     final Block blk1v1 = new Block(1L, len, 1L);
     final Block blk1v2 = new Block(1L, len, 2L);
@@ -208,12 +208,12 @@ public void testGetCorruptReplicaGenerationStamp() {
     assertEquals(Long.valueOf(2L), crm.getCorruptReplicaGenerationStamp(blk1v1, dn2));
     assertEquals(Long.valueOf(1L), crm.getCorruptReplicaGenerationStamp(blk1v2, dn1));
     assertEquals(Long.valueOf(2L), crm.getCorruptReplicaGenerationStamp(blk1v2, dn2));
-    
+
     // Validate null returned for non-existent block replica
     assertEquals(Long.valueOf(100L), crm.getCorruptReplicaGenerationStamp(blk2, dn1));
     assertNull(crm.getCorruptReplicaGenerationStamp(blk2, dn2));
   }
-  
+
   private static void addToCorruptReplicasMap(CorruptReplicasMap crm,
       BlockInfo blk, DatanodeDescriptor dn) {
     crm.addToCorruptReplicasMap(blk, dn, "TEST", Reason.NONE, blk.isStriped());