Author: kihwal
Date: Fri Mar 21 17:58:33 2014
New Revision: 1579998
URL: http://svn.apache.org/r1579998
Log:
svn merge -c 1579995 merging from trunk to branch-2 to fix:MAPREDUCE-5804.
TestMRJobsWithProfiler#testProfiler timesout. Contributed by Mit Desai.
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRJobsWithProfiler.java
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1579998&r1=1579997&r2=1579998&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Fri
Mar 21 17:58:33 2014
@@ -21,6 +21,9 @@ Release 2.5.0 - UNRELEASED
MAPREDUCE-5456. TestFetcher.testCopyFromHostExtraBytes is missing (Jason
Lowe via jeagles)
+ MAPREDUCE-5804. TestMRJobsWithProfiler#testProfiler timesout (Mit Desai
+ via kihwal)
+
OPTIMIZATIONS
BUG FIXES
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRJobsWithProfiler.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRJobsWithProfiler.java?rev=1579998&r1=1579997&r2=1579998&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRJobsWithProfiler.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRJobsWithProfiler.java
Fri Mar 21 17:58:33 2014
@@ -104,7 +104,7 @@ public class TestMRJobsWithProfiler {
}
- @Test (timeout = 120000)
+ @Test (timeout = 150000)
public void testProfiler() throws IOException, InterruptedException,
ClassNotFoundException {
if (!(new File(MiniMRYarnCluster.APPJAR)).exists()) {
