Repository: hadoop Updated Branches: refs/heads/branch-2 e8a9a69a2 -> 6941e2ccb refs/heads/branch-2.7 bfee573ba -> af9de19cf refs/heads/branch-2.8 e045856ed -> c2ec24198 refs/heads/trunk d6b1acb94 -> eb2fb943f
HDFS-9740. Use a reasonable limit in DFSTestUtil.waitForMetric() (Contributed by Chang Li) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/eb2fb943 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/eb2fb943 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/eb2fb943 Branch: refs/heads/trunk Commit: eb2fb943fd97c191fd7c4f5333087a28ee5c87d8 Parents: d6b1acb Author: Vinayakumar B <vinayakum...@apache.org> Authored: Wed Feb 3 11:14:29 2016 +0530 Committer: Vinayakumar B <vinayakum...@apache.org> Committed: Wed Feb 3 11:14:29 2016 +0530 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/eb2fb943/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 4eabce5..1c01978 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -2760,6 +2760,9 @@ Release 2.7.3 - UNRELEASED HDFS-9406. FSImage may get corrupted after deleting snapshot. (Contributed by Jing Zhao, Stanislav Antic, Vinayakumar B, Yongjun Zhang) + HDFS-9740. Use a reasonable limit in DFSTestUtil.waitForMetric() + (Chang Li via vinayakumarb) + Release 2.7.2 - 2016-01-25 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/eb2fb943/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java index d6a7b93..dc1853a 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java @@ -2023,6 +2023,6 @@ public class DFSTestUtil { throw new UnhandledException("Test failed due to unexpected exception", e); } } - }, 1000, Integer.MAX_VALUE); + }, 1000, 60000); } }
