This is an automated email from the ASF dual-hosted git repository. tomscut pushed a commit to branch revert-4901-HDFS-16776 in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit 24ddec9b2c2c76ba3b384f8e048d29313617a322 Author: litao <tomlees...@gmail.com> AuthorDate: Fri Jul 26 10:10:47 2024 +0800 Revert "HDFS-16776 Erasure Coding: The length of targets should be checked wh…" This reverts commit 9a29075f915173e24c77cf8aea2908da0aa328e3. --- .../hadoop/hdfs/server/datanode/erasurecode/StripedReconstructor.java | 4 ---- .../apache/hadoop/hdfs/server/datanode/erasurecode/StripedWriter.java | 4 +--- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedReconstructor.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedReconstructor.java index 7acb6792001..466c7c4254c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedReconstructor.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedReconstructor.java @@ -288,10 +288,6 @@ abstract class StripedReconstructor { return decoder; } - int getNumLiveBlocks(){ - return liveBitSet.cardinality(); - } - void cleanup() { if (decoder != null) { decoder.release(); diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedWriter.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedWriter.java index 00be1279c81..ca06dfc1205 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedWriter.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedWriter.java @@ -82,10 +82,8 @@ class StripedWriter { assert targetStorageIds != null; writers = new StripedBlockWriter[targets.length]; + targetIndices = new short[targets.length]; - Preconditions.checkArgument( - targetIndices.length <= dataBlkNum + parityBlkNum - reconstructor.getNumLiveBlocks(), - "Reconstruction work gets too much targets."); Preconditions.checkArgument(targetIndices.length <= parityBlkNum, "Too much missed striped blocks."); initTargetIndices(); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org