Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-7936. Erasure coding: resolving conflicts in the branch when merging (this commit is for HDFS-7742)

This commit is contained in:
Zhe Zhang 2015-03-30 10:23:09 -07:00 committed by Zhe Zhang
parent d9af36b9bd
commit 97378e4cd0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -557,11 +557,11 @@ public class TestBlockManager {
assertNotNull("Chooses decommissioning source node for a normal replication" assertNotNull("Chooses decommissioning source node for a normal replication"
+ " if all available source nodes have reached their replication" + " if all available source nodes have reached their replication"
+ " limits below the hard limit.", + " limits below the hard limit.",
bm.chooseSourceDatanode( bm.chooseSourceDatanodes(
aBlock, bm.getStoredBlock(aBlock),
cntNodes, cntNodes,
liveNodes, liveNodes,
new NumberReplicas(), new NumberReplicas(), new LinkedList<Short>(), 1,
UnderReplicatedBlocks.QUEUE_UNDER_REPLICATED)); UnderReplicatedBlocks.QUEUE_UNDER_REPLICATED));
@ -571,11 +571,11 @@ public class TestBlockManager {
assertNull("Does not choose a source decommissioning node for a normal" assertNull("Does not choose a source decommissioning node for a normal"
+ " replication when all available nodes exceed the hard limit.", + " replication when all available nodes exceed the hard limit.",
bm.chooseSourceDatanode( bm.chooseSourceDatanodes(
aBlock, bm.getStoredBlock(aBlock),
cntNodes, cntNodes,
liveNodes, liveNodes,
new NumberReplicas(), new NumberReplicas(), new LinkedList<Short>(), 1,
UnderReplicatedBlocks.QUEUE_UNDER_REPLICATED)); UnderReplicatedBlocks.QUEUE_UNDER_REPLICATED));
} }