You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by br...@apache.org on 2017/07/16 03:47:55 UTC
[2/2] hadoop git commit: HDFS-12112.
TestBlockManager#testBlockManagerMachinesArray sometimes fails with NPE.
Contributed by Wei-Chiu Chuang.
HDFS-12112. TestBlockManager#testBlockManagerMachinesArray sometimes fails with NPE. Contributed by Wei-Chiu Chuang.
(cherry picked from commit b778887af59d96f1fac30cae14be1cabbdb74c8b)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6039a2a5
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6039a2a5
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6039a2a5
Branch: refs/heads/branch-2.8
Commit: 6039a2a55f9ff0a415102f02f880c3808199a68d
Parents: 8b7d1df
Author: Brahma Reddy Battula <br...@apache.org>
Authored: Sat Jul 15 10:38:31 2017 +0800
Committer: Brahma Reddy Battula <br...@apache.org>
Committed: Sat Jul 15 11:12:56 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/6039a2a5/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 111bfa8..14b04c0 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
@@ -1149,7 +1149,7 @@ public class TestBlockManager {
}
}
- @Test
+ @Test(timeout = 60000)
public void testBlockManagerMachinesArray() throws Exception {
final Configuration conf = new HdfsConfiguration();
final MiniDFSCluster cluster =
@@ -1160,6 +1160,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-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org