From c983115e4c76aa7d72df7e33a78e3f8244e062f7 Mon Sep 17 00:00:00 2001 From: Jason Lowe Date: Tue, 17 May 2016 15:01:33 +0000 Subject: [PATCH] MAPREDUCE-6698. Increase timeout on TestUnnecessaryBlockingOnHistoryFileInfo.testTwoThreadsQueryingDifferentJobOfSameUser. Contributed by Haibo Chen (cherry picked from commit 34fddd1e912dcd9f898e500b8df11295ee49c0d8) --- .../v2/hs/TestUnnecessaryBlockingOnHistoryFileInfo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestUnnecessaryBlockingOnHistoryFileInfo.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestUnnecessaryBlockingOnHistoryFileInfo.java index 06045b5a76f..afe2e36652f 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestUnnecessaryBlockingOnHistoryFileInfo.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestUnnecessaryBlockingOnHistoryFileInfo.java @@ -83,7 +83,7 @@ public class TestUnnecessaryBlockingOnHistoryFileInfo { * blocked by the other while the other thread is holding the lock on its * associated job files and hanging up parsing the files. */ - @Test(timeout = 20000) + @Test(timeout = 600000) public void testTwoThreadsQueryingDifferentJobOfSameUser() throws InterruptedException, IOException { final Configuration config = new Configuration();