Author: jeagles
Date: Fri Feb 21 16:43:11 2014
New Revision: 1570631
URL: http://svn.apache.org/r1570631
Log:
MAPREDUCE-5688. TestStagingCleanup fails intermittently with JDK7 (Mit Desai
via jeagles)
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestStagingCleanup.java
Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1570631&r1=1570630&r2=1570631&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Fri Feb 21
16:43:11 2014
@@ -150,6 +150,9 @@ Release 2.5.0 - UNRELEASED
MAPREDUCE-5671. NaN can be created by client and assign to Progress (Chen
He via jeagles)
+ MAPREDUCE-5688. TestStagingCleanup fails intermittently with JDK7 (Mit
+ Desai via jeagles)
+
OPTIMIZATIONS
BUG FIXES
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestStagingCleanup.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestStagingCleanup.java?rev=1570631&r1=1570630&r2=1570631&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestStagingCleanup.java
(original)
+++
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestStagingCleanup.java
Fri Feb 21 16:43:11 2014
@@ -34,6 +34,7 @@ import junit.framework.TestCase;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.mapreduce.Counters;
import org.apache.hadoop.mapreduce.JobID;
import org.apache.hadoop.mapreduce.MRJobConfig;
import org.apache.hadoop.mapreduce.TypeConverter;
@@ -124,7 +125,7 @@ import org.junit.Test;
when(fs.exists(stagingDir)).thenReturn(true);
ApplicationId appId =
ApplicationId.newInstance(System.currentTimeMillis(),
0);
- ApplicationAttemptId attemptId = ApplicationAttemptId.newInstance(appId,
0);
+ ApplicationAttemptId attemptId = ApplicationAttemptId.newInstance(appId,
1);
JobId jobid = recordFactory.newRecordInstance(JobId.class);
jobid.setAppId(appId);
ContainerAllocator mockAlloc = mock(ContainerAllocator.class);
@@ -149,7 +150,7 @@ import org.junit.Test;
when(fs.exists(stagingDir)).thenReturn(true);
ApplicationId appId =
ApplicationId.newInstance(System.currentTimeMillis(),
0);
- ApplicationAttemptId attemptId = ApplicationAttemptId.newInstance(appId,
0);
+ ApplicationAttemptId attemptId = ApplicationAttemptId.newInstance(appId,
1);
ContainerAllocator mockAlloc = mock(ContainerAllocator.class);
Assert.assertTrue(MRJobConfig.DEFAULT_MR_AM_MAX_ATTEMPTS > 1);
MRAppMaster appMaster = new TestMRApp(attemptId, mockAlloc,
@@ -282,6 +283,7 @@ import org.junit.Test;
String diagnostic) {
JobImpl jobImpl = mock(JobImpl.class);
when(jobImpl.getInternalState()).thenReturn(this.jobStateInternal);
+ when(jobImpl.getAllCounters()).thenReturn(new Counters());
JobID jobID = JobID.forName("job_1234567890000_0001");
JobId jobId = TypeConverter.toYarn(jobID);
when(jobImpl.getID()).thenReturn(jobId);
