Repository: hadoop Updated Branches: refs/heads/branch-2 fc989ebe1 -> ae0d5d691
HDFS-8729. Fix TestFileTruncate#testTruncateWithDataNodesRestartImmediately which occasionally failed. Contributed by Walter Su. (cherry picked from commit f4ca530c1cc9ece25c5ef01f99a94eb9e678e890) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ae0d5d69 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ae0d5d69 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ae0d5d69 Branch: refs/heads/branch-2 Commit: ae0d5d6917e7b8ff744e75d74a24afb08d6098c9 Parents: fc989eb Author: Jing Zhao <[email protected]> Authored: Thu Jul 9 13:17:52 2015 -0700 Committer: Jing Zhao <[email protected]> Committed: Thu Jul 9 13:18:35 2015 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../org/apache/hadoop/hdfs/server/namenode/TestFileTruncate.java | 3 +++ 2 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ae0d5d69/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 13e064a..ece8e26 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -687,6 +687,9 @@ Release 2.8.0 - UNRELEASED HDFS-8642. Make TestFileTruncate more reliable. (Rakesh R via Arpit Agarwal) + HDFS-8729. Fix TestFileTruncate#testTruncateWithDataNodesRestartImmediately + which occasionally failed. (Walter Su via jing9) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/ae0d5d69/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 a91d6c9..8e54edc 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 @@ -804,6 +804,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 on dn0
