From eb2fb943fd97c191fd7c4f5333087a28ee5c87d8 Mon Sep 17 00:00:00 2001 From: Vinayakumar B Date: Wed, 3 Feb 2016 11:14:29 +0530 Subject: [PATCH] HDFS-9740. Use a reasonable limit in DFSTestUtil.waitForMetric() (Contributed by Chang Li) --- 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(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 4eabce534e..1c01978f1f 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 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 d6a7b930a8..dc1853a6b1 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 Boolean get() { throw new UnhandledException("Test failed due to unexpected exception", e); } } - }, 1000, Integer.MAX_VALUE); + }, 1000, 60000); } }