HDFS-17218. Modify patch based on comments

Author: haiyang1987

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

@@ -3104,7 +3104,7 @@ void processTimedOutExcessBlocks() {
         Map.Entry<String, LightWeightHashSet<ExcessBlockInfo>> entry = iter.next();
         String datanodeUuid = entry.getKey();
         LightWeightHashSet<ExcessBlockInfo> blocks = entry.getValue();
-        List<ExcessRedundancyMap.ExcessBlockInfo> sortedBlocks = new ArrayList<>(blocks);
+        List<ExcessBlockInfo> sortedBlocks = new ArrayList<>(blocks);
         // Sort blocks by timestamp in descending order.
         Collections.sort(sortedBlocks);
 
@@ -3130,18 +3130,16 @@ void processTimedOutExcessBlocks() {
           while (iterator.hasNext()) {
             DatanodeStorageInfo datanodeStorageInfo = iterator.next();
             DatanodeDescriptor datanodeDescriptor = datanodeStorageInfo.getDatanodeDescriptor();
-            if (datanodeDescriptor.getDatanodeUuid().equals(datanodeUuid)) {
-              if (datanodeStorageInfo.getState().equals(State.NORMAL)) {
-                final Block block = getBlockOnStorage(blockInfo,
-                    datanodeStorageInfo);
-                if (!containsInvalidateBlock(datanodeDescriptor, block)) {
-                  addToInvalidates(block, datanodeDescriptor);
-                  LOG.debug("Excess block timeout ({}, {}) is added to invalidated.",
-                      block, datanodeDescriptor);
-                }
-                excessBlockInfo.setTimeStamp();
-                break;
+            if (datanodeDescriptor.getDatanodeUuid().equals(datanodeUuid) &&
+                datanodeStorageInfo.getState().equals(State.NORMAL)) {
+              final Block block = getBlockOnStorage(blockInfo, datanodeStorageInfo);
+              if (!containsInvalidateBlock(datanodeDescriptor, block)) {
+                addToInvalidates(block, datanodeDescriptor);
+                LOG.debug("Excess block timeout ({}, {}) is added to invalidated.",
+                    block, datanodeDescriptor);
               }
+              excessBlockInfo.setTimeStamp();
+              break;
             }
           }
         }

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

@@ -67,7 +67,7 @@ synchronized void clear() {
    */
   synchronized boolean contains(DatanodeDescriptor dn, BlockInfo blk) {
     final LightWeightHashSet<ExcessBlockInfo> set = map.get(dn.getDatanodeUuid());
-    return set != null && set.contains(new ExcessBlockInfo(blk));
+    return set != null && set.contains(blk);
   }
 
   /**
@@ -102,7 +102,7 @@ synchronized boolean remove(DatanodeDescriptor dn, BlockInfo blk) {
       return false;
     }
 
-    final boolean removed = set.remove(new ExcessBlockInfo(blk));
+    final boolean removed = set.remove(blk);
     if (removed) {
       size.decrementAndGet();
       blockLog.debug("BLOCK* ExcessRedundancyMap.remove({}, {})", dn, blk);
@@ -153,11 +153,16 @@ public boolean equals(Object obj) {
       if (this == obj) {
         return true;
       }
-      if (!(obj instanceof ExcessBlockInfo)) {
-        return false;
+
+      if (obj instanceof ExcessBlockInfo) {
+        ExcessBlockInfo other = (ExcessBlockInfo) obj;
+        return this.blockInfo.equals(other.blockInfo);
+      }
+
+      if (obj instanceof BlockInfo) {
+       return this.blockInfo.equals(obj);
       }
-      ExcessBlockInfo other = (ExcessBlockInfo) obj;
-      return (this.blockInfo.equals(other.blockInfo));
+      return false;
     }
 
     @Override

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

@@ -2271,7 +2271,7 @@ public void delayDeleteReplica() {
       assertEquals(0, blockManager.getPendingDeletionBlocksCount());
       assertNotNull(excessDn);
 
-      // Name node will ask datanode to delete replicas in heartbeat response.
+      // NameNode will ask datanode to delete replicas in heartbeat response.
       cluster.triggerHeartbeats();
 
       // Wait for the datanode to process any block deletions