Repository: hadoop Updated Branches: refs/heads/branch-2.8 8657dece8 -> db415ea16
HDFS-10748. TestFileTruncate#testTruncateWithDataNodesRestart runs sometimes timeout. Contributed by Yiqun Lin. (cherry picked from commit 4da5000dd33cf013e7212848ed2c44f1e60e860e) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/db415ea1 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/db415ea1 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/db415ea1 Branch: refs/heads/branch-2.8 Commit: db415ea166221f3439efe2a5bc486be7a509f471 Parents: 8657dec Author: Xiaoyu Yao <[email protected]> Authored: Thu Aug 25 09:00:44 2016 -0700 Committer: Xiaoyu Yao <[email protected]> Committed: Thu Aug 25 09:22:16 2016 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hdfs/server/namenode/TestFileTruncate.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/db415ea1/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileTruncate.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileTruncate.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileTruncate.java index 6755c26..bc81987 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileTruncate.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileTruncate.java @@ -699,6 +699,9 @@ public class TestFileTruncate { assertEquals(newBlock.getBlock().getGenerationStamp(), oldBlock.getBlock().getGenerationStamp() + 1); + Thread.sleep(2000); + // trigger the second time BR to delete the corrupted replica if there's one + cluster.triggerBlockReports(); // Wait replicas come to 3 DFSTestUtil.waitReplication(fs, p, REPLICATION); // Old replica is disregarded and replaced with the truncated one --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
