Repository: hadoop Updated Branches: refs/heads/branch-2 4446512e9 -> 60418c9b2
HDFS-7572. TestLazyPersistFiles#testDnRestartWithSavedReplicas is flaky on Windows. Contributed by Arpit Agarwal. (cherry picked from commit dfd2589bcb0e83f073eab30e32badcf2e9f75a62) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/60418c9b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/60418c9b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/60418c9b Branch: refs/heads/branch-2 Commit: 60418c9b2d5424337d1ba74e199a2993ca0c14a1 Parents: 4446512 Author: cnauroth <cnaur...@apache.org> Authored: Mon Jan 5 10:39:15 2015 -0800 Committer: cnauroth <cnaur...@apache.org> Committed: Mon Jan 5 10:39:38 2015 -0800 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../hdfs/server/datanode/fsdataset/impl/TestLazyPersistFiles.java | 1 + 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/60418c9b/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 b0dcef5..c0296fb 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -382,6 +382,9 @@ Release 2.7.0 - UNRELEASED HDFS-7563. NFS gateway parseStaticMap NumberFormatException (Yongjun Zhang via brandonli) + HDFS-7572. TestLazyPersistFiles#testDnRestartWithSavedReplicas is flaky on + Windows. (Arpit Agarwal via cnauroth) + Release 2.6.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/60418c9b/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 49d3c6d..ad2197a 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 @@ -633,6 +633,7 @@ public class TestLazyPersistFiles extends LazyPersistTestCase { LOG.info("Restarting the DataNode"); cluster.restartDataNode(0, true); cluster.waitActive(); + triggerBlockReport(); // Ensure that the replica is now on persistent storage. ensureFileReplicasOnStorageType(path1, DEFAULT);
