HDFS-7444. Addendum patch to resolve conflicts between HDFS-7444 and HDFS-7310.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/978736d4 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/978736d4 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/978736d4 Branch: refs/heads/HDFS-EC Commit: 978736d486a8775bc21d074010f58c28ae0fda41 Parents: f5b1631 Author: Haohui Mai <whe...@apache.org> Authored: Wed Nov 26 10:53:53 2014 -0800 Committer: Haohui Mai <whe...@apache.org> Committed: Wed Nov 26 10:53:53 2014 -0800 ---------------------------------------------------------------------- .../hadoop/hdfs/server/blockmanagement/TestReplicationPolicy.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/978736d4/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestReplicationPolicy.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestReplicationPolicy.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestReplicationPolicy.java index ddbf7fc..e4834d6 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestReplicationPolicy.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestReplicationPolicy.java @@ -1232,7 +1232,8 @@ public class TestReplicationPolicy { when(storage.getState()).thenReturn(DatanodeStorage.State.NORMAL); when(storage.getDatanodeDescriptor()).thenReturn(dn); when(storage.removeBlock(any(BlockInfo.class))).thenReturn(true); - when(storage.addBlock(any(BlockInfo.class))).thenReturn(true); + when(storage.addBlock(any(BlockInfo.class))).thenReturn + (DatanodeStorageInfo.AddBlockResult.ADDED); ucBlock.addStorage(storage); when(mbc.setLastBlock((BlockInfo) any(), (DatanodeStorageInfo[]) any()))