HDFS-16958. Fix bug in processing EC excess redundancy.

zhangshuyan0 · zhangshuyan0 · commit 6b854c23a1f1 · 2023-03-17T17:53:10.000+08:00
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
@@ -4148,8 +4148,7 @@ private void chooseExcessRedundancyStriped(BlockCollection bc,
       }
     }
 
-    // cardinality of found indicates the expected number of internal blocks
-    final int numOfTarget = found.cardinality();
+    final int numOfTarget = sblk.getRealDataBlockNum();
     final BlockStoragePolicy storagePolicy = storagePolicySuite.getPolicy(
         bc.getStoragePolicyID());
     final List<StorageType> excessTypes = storagePolicy.chooseExcess(

Original file line number	Diff line number	Diff line change
`@@ -4148,8 +4148,7 @@ private void chooseExcessRedundancyStriped(BlockCollection bc,`
`4148`	`4148`	`}`
`4149`	`4149`	`}`
`4150`	`4150`
`4151`		`- // cardinality of found indicates the expected number of internal blocks`
`4152`		`- final int numOfTarget = found.cardinality();`
	`4151`	`+ final int numOfTarget = sblk.getRealDataBlockNum();`
`4153`	`4152`	`final BlockStoragePolicy storagePolicy = storagePolicySuite.getPolicy(`
`4154`	`4153`	`bc.getStoragePolicyID());`
`4155`	`4154`	`final List<StorageType> excessTypes = storagePolicy.chooseExcess(`