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 ar...@apache.org on 2018/10/25 22:15:45 UTC
[2/4] hadoop git commit: HDFS-14029. Sleep in TestLazyPersistFiles
should be put into a loop. Contributed by Adam Antal.
HDFS-14029. Sleep in TestLazyPersistFiles should be put into a loop. Contributed by Adam Antal.
(cherry picked from commit 9b899f1ebd5126a756fceb43459164165488b203)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f6469adb
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f6469adb
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f6469adb
Branch: refs/heads/branch-3.0
Commit: f6469adbb10fe1ea17f1b7012196a25208d2792b
Parents: 96bdaf3
Author: Arpit Agarwal <ar...@apache.org>
Authored: Thu Oct 25 15:14:13 2018 -0700
Committer: Arpit Agarwal <ar...@apache.org>
Committed: Thu Oct 25 15:14:39 2018 -0700
----------------------------------------------------------------------
.../fsdataset/impl/TestLazyPersistFiles.java | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f6469adb/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: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org