From 642b613a7d0e0c2cfb52d4253e156a4ffc673a37 Mon Sep 17 00:00:00 2001 From: Arpit Agarwal Date: Thu, 25 Oct 2018 15:14:13 -0700 Subject: [PATCH] HDFS-14029. Sleep in TestLazyPersistFiles should be put into a loop. Contributed by Adam Antal. (cherry picked from commit 9b899f1ebd5126a756fceb43459164165488b203) --- .../fsdataset/impl/TestLazyPersistFiles.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestLazyPersistFiles.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestLazyPersistFiles.java index 71a9f6f572c..04f81278834 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestLazyPersistFiles.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestLazyPersistFiles.java @@ -151,7 +151,7 @@ public class TestLazyPersistFiles extends LazyPersistTestCase { /** * If NN restarted then lazyPersist files should not deleted */ - @Test + @Test(timeout = 20000) public void testFileShouldNotDiscardedIfNNRestarted() throws IOException, InterruptedException, TimeoutException { getClusterBuilder().setRamDiskReplicaCapacity(2).build(); @@ -165,13 +165,12 @@ public class TestLazyPersistFiles extends LazyPersistTestCase { cluster.restartNameNodes(); // wait for the redundancy monitor to mark the file as corrupt. - Thread.sleep(2 * DFS_NAMENODE_REDUNDANCY_INTERVAL_SECONDS_DEFAULT * 1000); - - Long corruptBlkCount = (long) Iterators.size(cluster.getNameNode() - .getNamesystem().getBlockManager().getCorruptReplicaBlockIterator()); - - // Check block detected as corrupted - assertThat(corruptBlkCount, is(1L)); + Long corruptBlkCount; + do { + Thread.sleep(DFS_NAMENODE_REDUNDANCY_INTERVAL_SECONDS_DEFAULT * 1000); + corruptBlkCount = (long) Iterators.size(cluster.getNameNode() + .getNamesystem().getBlockManager().getCorruptReplicaBlockIterator()); + } while (corruptBlkCount != 1L); // Ensure path1 exist. Assert.assertTrue(fs.exists(path1));