HDFS-12112. TestBlockManager#testBlockManagerMachinesArray sometimes fails with NPE. Contributed by Wei-Chiu Chuang.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b778887a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b778887a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b778887a Branch: refs/heads/HDFS-7240 Commit: b778887af59d96f1fac30cae14be1cabbdb74c8b Parents: 06ece48 Author: Brahma Reddy Battula <bra...@apache.org> Authored: Sat Jul 15 10:38:31 2017 +0800 Committer: Brahma Reddy Battula <bra...@apache.org> Committed: Sat Jul 15 10:38:31 2017 +0800 ---------------------------------------------------------------------- .../hadoop/hdfs/server/blockmanagement/TestBlockManager.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b778887a/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 3088b7b..6b1a979 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 @@ -1219,7 +1219,7 @@ public class TestBlockManager { } } - @Test + @Test(timeout = 60000) public void testBlockManagerMachinesArray() throws Exception { final Configuration conf = new HdfsConfiguration(); final MiniDFSCluster cluster = @@ -1230,6 +1230,8 @@ public class TestBlockManager { final Path filePath = new Path("/tmp.txt"); final long fileLen = 1L; DFSTestUtil.createFile(fs, filePath, fileLen, (short) 3, 1L); + DFSTestUtil.waitForReplication((DistributedFileSystem)fs, + filePath, (short) 3, 60000); ArrayList<DataNode> datanodes = cluster.getDataNodes(); assertEquals(datanodes.size(), 4); FSNamesystem ns = cluster.getNamesystem(); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org