This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new 12f2d12 HDFS-14849. Erasure Coding: the internal block is replicated
many times when datanode is decommissioning. Contributed by HuangTao.
12f2d12 is described below
commit 12f2d121ca9f73792184fce71994b226e4d26625
Author: Ayush Saxena <ayushsax...@apache.org>
AuthorDate: Sat Sep 28 21:44:44 2019 +0530
HDFS-14849. Erasure Coding: the internal block is replicated many times
when datanode is decommissioning. Contributed by HuangTao.
(cherry picked from commit c4c8d5fd0e3c17ccdcf18ece8e005f510328b060)
(cherry picked from commit 9a9edfa87ebb007b1dda089a166184fbb6797820)
Conflicts:
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockManager.java
---
.../hdfs/server/blockmanagement/BlockManager.java | 12 +++--
.../server/blockmanagement/TestBlockManager.java | 58 ++++++++++++++++++++++
2 files changed, 65 insertions(+), 5 deletions(-)
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
index 213b792..e9c11b9 100644
---
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
@@ -2349,11 +2349,13 @@ public class BlockManager implements BlockStatsMXBean {
if (isStriped) {
blockIndex = ((BlockInfoStriped) block)
.getStorageBlockIndex(storage);
- if (!bitSet.get(blockIndex)) {
- bitSet.set(blockIndex);
- } else if (state == StoredReplicaState.LIVE) {
- numReplicas.subtract(StoredReplicaState.LIVE, 1);
- numReplicas.add(StoredReplicaState.REDUNDANT, 1);
+ if (state == StoredReplicaState.LIVE) {
+ if (!bitSet.get(blockIndex)) {
+ bitSet.set(blockIndex);
+ } else {
+ numReplicas.subtract(StoredReplicaState.LIVE, 1);
+ numReplicas.add(StoredReplicaState.REDUNDANT, 1);
+ }
}
}
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockManager.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockManager.java
index 67c7e74..623ab1a 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockManager.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockManager.java
@@ -23,6 +23,7 @@ import com.google.common.collect.LinkedListMultimap;
import com.google.common.collect.Lists;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hdfs.protocol.SystemErasureCodingPolicies;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.CreateFlag;
import org.apache.hadoop.fs.FSDataInputStream;
@@ -750,6 +751,63 @@ public class TestBlockManager {
}
@Test
+ public void testChooseSrcDNWithDupECInDecommissioningNode() throws Exception
{
+ long blockId = -9223372036854775776L; // real ec block id
+ Block aBlock = new Block(blockId, 0, 0);
+ // RS-3-2 EC policy
+ ErasureCodingPolicy ecPolicy =
+ SystemErasureCodingPolicies.getPolicies().get(1);
+ // striped blockInfo
+ BlockInfoStriped aBlockInfoStriped = new BlockInfoStriped(aBlock,
ecPolicy);
+ // ec storageInfo
+ DatanodeStorageInfo ds1 = DFSTestUtil.createDatanodeStorageInfo(
+ "storage1", "1.1.1.1", "rack1", "host1");
+ DatanodeStorageInfo ds2 = DFSTestUtil.createDatanodeStorageInfo(
+ "storage2", "2.2.2.2", "rack2", "host2");
+ DatanodeStorageInfo ds3 = DFSTestUtil.createDatanodeStorageInfo(
+ "storage3", "3.3.3.3", "rack3", "host3");
+ DatanodeStorageInfo ds4 = DFSTestUtil.createDatanodeStorageInfo(
+ "storage4", "4.4.4.4", "rack4", "host4");
+ DatanodeStorageInfo ds5 = DFSTestUtil.createDatanodeStorageInfo(
+ "storage5", "5.5.5.5", "rack5", "host5");
+ DatanodeStorageInfo ds6 = DFSTestUtil.createDatanodeStorageInfo(
+ "storage6", "6.6.6.6", "rack6", "host6");
+
+ // link block with storage
+ aBlockInfoStriped.addStorage(ds1, aBlock);
+ aBlockInfoStriped.addStorage(ds2, new Block(blockId + 1, 0, 0));
+ aBlockInfoStriped.addStorage(ds3, new Block(blockId + 2, 0, 0));
+ aBlockInfoStriped.addStorage(ds4, new Block(blockId + 3, 0, 0));
+ aBlockInfoStriped.addStorage(ds5, new Block(blockId + 4, 0, 0));
+ // NOTE: duplicate block 0，this DN will replace the decommission ds1 DN
+ aBlockInfoStriped.addStorage(ds6, aBlock);
+
+ addEcBlockToBM(blockId, ecPolicy);
+ // decommission datanode where store block 0
+ ds1.getDatanodeDescriptor().startDecommission();
+
+ List<DatanodeDescriptor> containingNodes =
+ new LinkedList<DatanodeDescriptor>();
+ List<DatanodeStorageInfo> nodesContainingLiveReplicas =
+ new LinkedList<DatanodeStorageInfo>();
+ NumberReplicas numReplicas = new NumberReplicas();
+ List<Byte> liveBlockIndices = new ArrayList<>();
+
+ bm.chooseSourceDatanodes(
+ aBlockInfoStriped,
+ containingNodes,
+ nodesContainingLiveReplicas,
+ numReplicas, liveBlockIndices,
+ LowRedundancyBlocks.QUEUE_HIGHEST_PRIORITY);
+ assertEquals("There are 5 live replicas in " +
+ "[ds2, ds3, ds4, ds5, ds6] datanodes ",
+ 5, numReplicas.liveReplicas());
+ assertEquals("The ds1 datanode is in decommissioning, " +
+ "so there is no redundant replica",
+ 0, numReplicas.redundantInternalBlocks());
+ }
+
+ @Test
public void testFavorDecomUntilHardLimit() throws Exception {
bm.maxReplicationStreams = 0;
bm.replicationStreamsHardLimit = 1;
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
