HDFS-9225. Fix intermittent test failure of TestBlockManager.testBlocksAreNotUnderreplicatedInSingleRack. Contributed by Masatake Iwasaki.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3e50f478 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3e50f478 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3e50f478 Branch: refs/heads/HADOOP-11890 Commit: 3e50f478b9f40fccd7b22f8fbd95d2bfda7867d2 Parents: 2f19602 Author: Andrew Wang <w...@apache.org> Authored: Wed Oct 21 14:55:23 2015 -0700 Committer: Andrew Wang <w...@apache.org> Committed: Wed Oct 21 14:55:23 2015 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 4 ++++ .../hadoop/hdfs/server/blockmanagement/TestBlockManager.java | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/3e50f478/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index cf4abd4..83418f8 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1549,6 +1549,10 @@ Release 2.8.0 - UNRELEASED HDFS-8647. Abstract BlockManager's rack policy into BlockPlacementPolicy. (Brahma Reddy Battula via mingma) + HDFS-9225. Fix intermittent test failure of + TestBlockManager.testBlocksAreNotUnderreplicatedInSingleRack. + (Masatake Iwasaki via wang) + OPTIMIZATIONS HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than http://git-wip-us.apache.org/repos/asf/hadoop/blob/3e50f478/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 5692152..16d482e 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 @@ -100,6 +100,7 @@ public class TestBlockManager { fsn = Mockito.mock(FSNamesystem.class); Mockito.doReturn(true).when(fsn).hasWriteLock(); Mockito.doReturn(true).when(fsn).hasReadLock(); + Mockito.doReturn(true).when(fsn).isRunning(); bm = new BlockManager(fsn, conf); final String[] racks = { "/rackA", @@ -373,9 +374,8 @@ public class TestBlockManager { List<DatanodeDescriptor> origNodes) throws Exception { assertEquals(0, bm.numOfUnderReplicatedBlocks()); - addBlockOnNodes(testIndex, origNodes); - bm.processMisReplicatedBlocks(); - assertEquals(0, bm.numOfUnderReplicatedBlocks()); + BlockInfo block = addBlockOnNodes(testIndex, origNodes); + assertFalse(bm.isNeededReplication(block, bm.countLiveNodes(block))); }
