From e1af3c9bb7b9a5c4a29f411c412ad9667ed9818b Mon Sep 17 00:00:00 2001 From: Inigo Goiri Date: Wed, 19 Sep 2018 09:30:25 -0700 Subject: [PATCH] HDFS-13908. TestDataNodeMultipleRegistrations is flaky. Contributed by Ayush Saxena. (cherry picked from commit 56e0d635e0f49772d001c1fdb385110c705a622a) --- .../server/datanode/TestDataNodeMultipleRegistrations.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMultipleRegistrations.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMultipleRegistrations.java index 8e1e23673af..027e9fb3d77 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMultipleRegistrations.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMultipleRegistrations.java @@ -250,7 +250,7 @@ public void testClusterIdMismatchAtStartupWithHA() throws Exception { try { cluster.startDataNodes(conf, 1, true, null, null); // let the initialization be complete - Thread.sleep(10000); + cluster.waitActive(); DataNode dn = cluster.getDataNodes().get(0); assertTrue("Datanode should be running", dn.isDatanodeUp()); assertEquals("Only one BPOfferService should be running", 1, @@ -274,7 +274,7 @@ public void testDNWithInvalidStorageWithHA() throws Exception { try { cluster.startDataNodes(conf, 1, true, null, null); // let the initialization be complete - Thread.sleep(10000); + cluster.waitActive(); DataNode dn = cluster.getDataNodes().get(0); assertTrue("Datanode should be running", dn.isDatanodeUp()); assertEquals("BPOfferService should be running", 1,