Repository: hadoop Updated Branches: refs/heads/branch-2 51e06c085 -> 9c47862d8
MAPREDUCE-6698. Increase timeout on TestUnnecessaryBlockingOnHistoryFileInfo.testTwoThreadsQueryingDifferentJobOfSameUser. Contributed by Haibo Chen (cherry picked from commit 34fddd1e912dcd9f898e500b8df11295ee49c0d8) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9c47862d Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9c47862d Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9c47862d Branch: refs/heads/branch-2 Commit: 9c47862d8770764eb3624a31c5c169d2a2a4f153 Parents: 51e06c0 Author: Jason Lowe <jl...@apache.org> Authored: Tue May 17 15:01:33 2016 +0000 Committer: Jason Lowe <jl...@apache.org> Committed: Tue May 17 15:04:02 2016 +0000 ---------------------------------------------------------------------- .../mapreduce/v2/hs/TestUnnecessaryBlockingOnHistoryFileInfo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/9c47862d/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestUnnecessaryBlockingOnHistoryFileInfo.java ---------------------------------------------------------------------- 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 06045b5..afe2e36 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(); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
