HDFS-7936. Erasure coding: resolving conflicts in the branch when merging (this commit is for HDFS-7742)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f6975aeb Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f6975aeb Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f6975aeb Branch: refs/heads/HDFS-7285 Commit: f6975aeb0f4d02a5a6e621c548aec0d6a1e3d9be Parents: dcb987a Author: Zhe Zhang <[email protected]> Authored: Mon Mar 30 10:23:09 2015 -0700 Committer: Zhe Zhang <[email protected]> Committed: Mon Apr 13 09:43:53 2015 -0700 ---------------------------------------------------------------------- .../hdfs/server/blockmanagement/TestBlockManager.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f6975aeb/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockManager.java ---------------------------------------------------------------------- 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 cbea3d8..43f4607 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 @@ -552,11 +552,11 @@ public class TestBlockManager { assertNotNull("Chooses decommissioning source node for a normal replication" + " if all available source nodes have reached their replication" + " limits below the hard limit.", - bm.chooseSourceDatanode( - aBlock, + bm.chooseSourceDatanodes( + bm.getStoredBlock(aBlock), cntNodes, liveNodes, - new NumberReplicas(), + new NumberReplicas(), new LinkedList<Short>(), 1, UnderReplicatedBlocks.QUEUE_UNDER_REPLICATED)); @@ -566,11 +566,11 @@ public class TestBlockManager { assertNull("Does not choose a source decommissioning node for a normal" + " replication when all available nodes exceed the hard limit.", - bm.chooseSourceDatanode( - aBlock, + bm.chooseSourceDatanodes( + bm.getStoredBlock(aBlock), cntNodes, liveNodes, - new NumberReplicas(), + new NumberReplicas(), new LinkedList<Short>(), 1, UnderReplicatedBlocks.QUEUE_UNDER_REPLICATED)); }
