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

@@ -3112,18 +3112,20 @@ void processTimedOutExcessBlocks() {
           if (processed >= excessRedundancyTimeoutCheckLimit) {
             break;
           }
-          BlockInfo blockInfo = excessBlockInfo.getBlockInfo();
-          BlockInfo bi = blocksMap.getStoredBlock(blockInfo);
-          if (bi == null || bi.isDeleted()) {
-            continue;
-          }
 
+          processed++;
           // If the datanode doesn't have any excess block that has exceeded the timeout,
           // can exit this loop.
           if (now <= excessBlockInfo.getTimeStamp() + excessRedundancyTimeout) {
             break;
           }
 
+          BlockInfo blockInfo = excessBlockInfo.getBlockInfo();
+          BlockInfo bi = blocksMap.getStoredBlock(blockInfo);
+          if (bi == null || bi.isDeleted()) {
+            continue;
+          }
+
           Iterator<DatanodeStorageInfo> iterator = blockInfo.getStorageInfos();
           while (iterator.hasNext()) {
             DatanodeStorageInfo datanodeStorageInfo = iterator.next();
@@ -3138,7 +3140,6 @@ void processTimedOutExcessBlocks() {
                       block, datanodeDescriptor);
                 }
                 excessBlockInfo.setTimeStamp();
-                processed++;
                 break;
               }
             }