Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn merge -c 1579995 merging from trunk to branch-2 to fix:MAPREDUCE-5804. TestMRJobsWithProfiler#testProfiler timesout. Contributed by Mit Desai. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579998 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Kihwal Lee 2014-03-21 17:58:33 +00:00
parent e1bda693dd
commit 2c3feeb727
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -21,6 +21,9 @@ Release 2.5.0 - UNRELEASED
MAPREDUCE-5456. TestFetcher.testCopyFromHostExtraBytes is missing (Jason MAPREDUCE-5456. TestFetcher.testCopyFromHostExtraBytes is missing (Jason
Lowe via jeagles) Lowe via jeagles)
MAPREDUCE-5804. TestMRJobsWithProfiler#testProfiler timesout (Mit Desai
via kihwal)
OPTIMIZATIONS OPTIMIZATIONS
BUG FIXES BUG FIXES

2
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRJobsWithProfiler.java
View File

@ -104,7 +104,7 @@ public class TestMRJobsWithProfiler {
} }
@Test (timeout = 120000) @Test (timeout = 150000)
public void testProfiler() throws IOException, InterruptedException, public void testProfiler() throws IOException, InterruptedException,
ClassNotFoundException { ClassNotFoundException {
if (!(new File(MiniMRYarnCluster.APPJAR)).exists()) { if (!(new File(MiniMRYarnCluster.APPJAR)).exists()) {