Repository: hadoop Updated Branches: refs/heads/branch-3.0 96bdaf3b4 -> f6469adbb refs/heads/branch-3.1 e3bf7f29a -> 8b4f9b3e2 refs/heads/branch-3.2 3d6a6ce01 -> 642b613a7 refs/heads/trunk 34b2521f5 -> 9b899f1eb
HDFS-14029. Sleep in TestLazyPersistFiles should be put into a loop. Contributed by Adam Antal. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9b899f1e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9b899f1e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9b899f1e Branch: refs/heads/trunk Commit: 9b899f1ebd5126a756fceb43459164165488b203 Parents: 34b2521 Author: Arpit Agarwal <[email protected]> Authored: Thu Oct 25 15:14:13 2018 -0700 Committer: Arpit Agarwal <[email protected]> Committed: Thu Oct 25 15:14:13 2018 -0700 ---------------------------------------------------------------------- .../fsdataset/impl/TestLazyPersistFiles.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/9b899f1e/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestLazyPersistFiles.java ---------------------------------------------------------------------- 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 71a9f6f..04f8127 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)); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
