MAPREDUCE-2840. mr279 TestUberAM.testSleepJob test fails. (jonathan eagles via mahadev) - Merging r1184971 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1184972 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
065ca399c8
commit
e2edc8f20b
|
@ -1583,6 +1583,9 @@ Release 0.23.0 - Unreleased
|
|||
MAPREDUCE-3057. Job History Server goes of OutOfMemory with 1200 Jobs
|
||||
and Heap Size set to 10 GB. (Eric Payne via mahadev)
|
||||
|
||||
MAPREDUCE-2840. mr279 TestUberAM.testSleepJob test fails. (jonathan eagles
|
||||
via mahadev)
|
||||
|
||||
Release 0.22.0 - Unreleased
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
|
|
@ -27,8 +27,6 @@ import java.security.PrivilegedExceptionAction;
|
|||
import java.util.jar.JarOutputStream;
|
||||
import java.util.zip.ZipEntry;
|
||||
|
||||
import junit.framework.Assert;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.apache.hadoop.FailingMapper;
|
||||
|
@ -70,6 +68,7 @@ import org.apache.hadoop.security.token.Token;
|
|||
import org.apache.hadoop.security.token.TokenIdentifier;
|
||||
import org.apache.hadoop.yarn.conf.YarnConfiguration;
|
||||
import org.junit.AfterClass;
|
||||
import org.junit.Assert;
|
||||
import org.junit.BeforeClass;
|
||||
import org.junit.Test;
|
||||
|
||||
|
|
|
@ -21,8 +21,6 @@ package org.apache.hadoop.mapreduce.v2;
|
|||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
|
||||
import junit.framework.Assert;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.apache.hadoop.mapreduce.Counters;
|
||||
|
@ -34,11 +32,10 @@ import org.apache.hadoop.mapreduce.TaskAttemptID;
|
|||
import org.apache.hadoop.mapreduce.TaskCompletionEvent;
|
||||
import org.apache.hadoop.mapreduce.TaskID;
|
||||
import org.apache.hadoop.mapreduce.TaskType;
|
||||
import org.junit.Assert;
|
||||
import org.junit.BeforeClass;
|
||||
import org.junit.Ignore;
|
||||
import org.junit.Test;
|
||||
|
||||
@Ignore
|
||||
public class TestUberAM extends TestMRJobs {
|
||||
|
||||
private static final Log LOG = LogFactory.getLog(TestUberAM.class);
|
||||
|
@ -138,8 +135,8 @@ public class TestUberAM extends TestMRJobs {
|
|||
|
||||
TaskCompletionEvent[] events = job.getTaskCompletionEvents(0, 2);
|
||||
Assert.assertEquals(1, events.length);
|
||||
Assert.assertEquals(TaskCompletionEvent.Status.FAILED,
|
||||
events[0].getStatus().FAILED);
|
||||
Assert.assertEquals(TaskCompletionEvent.Status.TIPFAILED,
|
||||
events[0].getStatus());
|
||||
Assert.assertEquals(JobStatus.State.FAILED, job.getJobState());
|
||||
|
||||
//Disabling till UberAM honors MRJobConfig.MAP_MAX_ATTEMPTS
|
||||
|
|
Loading…
Reference in New Issue