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 vi...@apache.org on 2016/02/03 06:55:44 UTC
[4/4] hadoop git commit: HDFS-9740. Use a reasonable limit in
DFSTestUtil.waitForMetric() (Contributed by Chang Li)
HDFS-9740. Use a reasonable limit in DFSTestUtil.waitForMetric() (Contributed by Chang Li)
(cherry picked from commit eb2fb943fd97c191fd7c4f5333087a28ee5c87d8)
Conflicts:
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java
(cherry picked from commit 6941e2ccbf6f4c7c8663a68c7a7c9ed59bb49fbf)
Conflicts:
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/af9de19c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/af9de19c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/af9de19c
Branch: refs/heads/branch-2.7
Commit: af9de19cfd7f3ad0d2d075bf79efdcee46868ca1
Parents: bfee573
Author: Vinayakumar B <vi...@apache.org>
Authored: Wed Feb 3 11:14:29 2016 +0530
Committer: Vinayakumar B <vi...@apache.org>
Committed: Wed Feb 3 11:24:26 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/af9de19c/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 8af384c..2a6c0d7 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -81,6 +81,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/af9de19c/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 0fbc631..d0dba9f 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
@@ -1829,6 +1829,6 @@ public class DFSTestUtil {
throw new UnhandledException("Test failed due to unexpected exception", e);
}
}
- }, 1000, Integer.MAX_VALUE);
+ }, 1000, 60000);
}
}