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)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c2ec2419
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c2ec2419
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c2ec2419
Branch: refs/heads/branch-2.8
Commit: c2ec241989a439e352a004a22652ef2201218d2f
Parents: e045856
Author: Vinayakumar B <[email protected]>
Authored: Wed Feb 3 11:14:29 2016 +0530
Committer: Vinayakumar B <[email protected]>
Committed: Wed Feb 3 11:21:42 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/c2ec2419/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 4010d10..ace1e1c 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1779,6 +1779,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/c2ec2419/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 50c6d05..91641f3 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
@@ -1888,7 +1888,7 @@ public class DFSTestUtil {
throw new UnhandledException("Test failed due to unexpected
exception", e);
}
}
- }, 1000, Integer.MAX_VALUE);
+ }, 1000, 60000);
}
public static StorageReceivedDeletedBlocks[] makeReportForReceivedBlock(
