Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRApp.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/MRApp.java?rev=1399976&r1=1399975&r2=1399976&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRApp.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRApp.java Fri Oct 19 05:57:57 2012 @@ -50,8 +50,10 @@ import org.apache.hadoop.mapreduce.v2.ap import org.apache.hadoop.mapreduce.v2.api.records.TaskState; import org.apache.hadoop.mapreduce.v2.app.client.ClientService; import org.apache.hadoop.mapreduce.v2.app.job.Job; +import org.apache.hadoop.mapreduce.v2.app.job.JobStateInternal; import org.apache.hadoop.mapreduce.v2.app.job.Task; import org.apache.hadoop.mapreduce.v2.app.job.TaskAttempt; +import org.apache.hadoop.mapreduce.v2.app.job.TaskAttemptStateInternal; import org.apache.hadoop.mapreduce.v2.app.job.event.JobEvent; import org.apache.hadoop.mapreduce.v2.app.job.event.JobEventType; import org.apache.hadoop.mapreduce.v2.app.job.event.JobFinishEvent; @@ -60,6 +62,7 @@ import org.apache.hadoop.mapreduce.v2.ap import org.apache.hadoop.mapreduce.v2.app.job.event.TaskAttemptEvent; import org.apache.hadoop.mapreduce.v2.app.job.event.TaskAttemptEventType; import org.apache.hadoop.mapreduce.v2.app.job.impl.JobImpl; +import org.apache.hadoop.mapreduce.v2.app.job.impl.TaskAttemptImpl; import org.apache.hadoop.mapreduce.v2.app.launcher.ContainerLauncher; import org.apache.hadoop.mapreduce.v2.app.launcher.ContainerLauncherEvent; import org.apache.hadoop.mapreduce.v2.app.rm.ContainerAllocator; @@ -240,6 +243,24 @@ public class MRApp extends MRAppMaster { return job; } + public void waitForInternalState(TaskAttemptImpl attempt, + TaskAttemptStateInternal finalState) throws Exception { + int timeoutSecs = 0; + TaskAttemptReport report = attempt.getReport(); + TaskAttemptStateInternal iState = attempt.getInternalState(); + while (!finalState.equals(iState) && timeoutSecs++ < 20) { + System.out.println("TaskAttempt Internal State is : " + iState + + " Waiting for Internal state : " + finalState + " progress : " + + report.getProgress()); + Thread.sleep(500); + report = attempt.getReport(); + iState = attempt.getInternalState(); + } + System.out.println("TaskAttempt Internal State is : " + iState); + Assert.assertEquals("TaskAttempt Internal state is not correct (timedout)", + finalState, iState); + } + public void waitForState(TaskAttempt attempt, TaskAttemptState finalState) throws Exception { int timeoutSecs = 0; @@ -501,18 +522,18 @@ public class MRApp extends MRAppMaster { //override the init transition private final TestInitTransition initTransition = new TestInitTransition( maps, reduces); - StateMachineFactory<JobImpl, JobState, JobEventType, JobEvent> localFactory - = stateMachineFactory.addTransition(JobState.NEW, - EnumSet.of(JobState.INITED, JobState.FAILED), + StateMachineFactory<JobImpl, JobStateInternal, JobEventType, JobEvent> localFactory + = stateMachineFactory.addTransition(JobStateInternal.NEW, + EnumSet.of(JobStateInternal.INITED, JobStateInternal.FAILED), JobEventType.JOB_INIT, // This is abusive. initTransition); - private final StateMachine<JobState, JobEventType, JobEvent> + private final StateMachine<JobStateInternal, JobEventType, JobEvent> localStateMachine; @Override - protected StateMachine<JobState, JobEventType, JobEvent> getStateMachine() { + protected StateMachine<JobStateInternal, JobEventType, JobEvent> getStateMachine() { return localStateMachine; }
Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestFail.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/TestFail.java?rev=1399976&r1=1399975&r2=1399976&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestFail.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestFail.java Fri Oct 19 05:57:57 2012 @@ -36,8 +36,10 @@ import org.apache.hadoop.mapreduce.v2.ap import org.apache.hadoop.mapreduce.v2.app.job.Job; import org.apache.hadoop.mapreduce.v2.app.job.Task; import org.apache.hadoop.mapreduce.v2.app.job.TaskAttempt; +import org.apache.hadoop.mapreduce.v2.app.job.TaskAttemptStateInternal; import org.apache.hadoop.mapreduce.v2.app.job.event.TaskAttemptEvent; import org.apache.hadoop.mapreduce.v2.app.job.event.TaskAttemptEventType; +import org.apache.hadoop.mapreduce.v2.app.job.impl.TaskAttemptImpl; import org.apache.hadoop.mapreduce.v2.app.launcher.ContainerLauncher; import org.apache.hadoop.mapreduce.v2.app.launcher.ContainerLauncherEvent; import org.apache.hadoop.mapreduce.v2.app.launcher.ContainerLauncherImpl; @@ -190,7 +192,8 @@ public class TestFail { Assert.assertEquals("Num attempts is not correct", maxAttempts, attempts .size()); TaskAttempt attempt = attempts.values().iterator().next(); - app.waitForState(attempt, TaskAttemptState.ASSIGNED); + app.waitForInternalState((TaskAttemptImpl) attempt, + TaskAttemptStateInternal.ASSIGNED); app.getDispatcher().getEventHandler().handle( new TaskAttemptEvent(attempt.getID(), TaskAttemptEventType.TA_CONTAINER_COMPLETED)); Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRMContainerAllocator.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/TestRMContainerAllocator.java?rev=1399976&r1=1399975&r2=1399976&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRMContainerAllocator.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRMContainerAllocator.java Fri Oct 19 05:57:57 2012 @@ -48,7 +48,6 @@ import org.apache.hadoop.mapreduce.MRJob import org.apache.hadoop.mapreduce.v2.api.records.JobId; import org.apache.hadoop.mapreduce.v2.api.records.JobState; import org.apache.hadoop.mapreduce.v2.api.records.TaskAttemptId; -import org.apache.hadoop.mapreduce.v2.api.records.TaskAttemptState; import org.apache.hadoop.mapreduce.v2.api.records.TaskId; import org.apache.hadoop.mapreduce.v2.api.records.TaskState; import org.apache.hadoop.mapreduce.v2.api.records.TaskType; @@ -56,11 +55,13 @@ import org.apache.hadoop.mapreduce.v2.ap import org.apache.hadoop.mapreduce.v2.app.job.Job; import org.apache.hadoop.mapreduce.v2.app.job.Task; import org.apache.hadoop.mapreduce.v2.app.job.TaskAttempt; +import org.apache.hadoop.mapreduce.v2.app.job.TaskAttemptStateInternal; import org.apache.hadoop.mapreduce.v2.app.job.event.JobUpdatedNodesEvent; import org.apache.hadoop.mapreduce.v2.app.job.event.TaskAttemptContainerAssignedEvent; import org.apache.hadoop.mapreduce.v2.app.job.event.TaskAttemptEvent; import org.apache.hadoop.mapreduce.v2.app.job.event.TaskAttemptEventType; import org.apache.hadoop.mapreduce.v2.app.job.event.TaskAttemptKillEvent; +import org.apache.hadoop.mapreduce.v2.app.job.impl.TaskAttemptImpl; import org.apache.hadoop.mapreduce.v2.app.rm.ContainerAllocator; import org.apache.hadoop.mapreduce.v2.app.rm.ContainerFailedEvent; import org.apache.hadoop.mapreduce.v2.app.rm.ContainerRequestEvent; @@ -411,8 +412,8 @@ public class TestRMContainerAllocator { // Wait till all map-attempts request for containers for (Task t : job.getTasks().values()) { if (t.getType() == TaskType.MAP) { - mrApp.waitForState(t.getAttempts().values().iterator().next(), - TaskAttemptState.UNASSIGNED); + mrApp.waitForInternalState((TaskAttemptImpl) t.getAttempts().values() + .iterator().next(), TaskAttemptStateInternal.UNASSIGNED); } } amDispatcher.await(); @@ -562,8 +563,8 @@ public class TestRMContainerAllocator { amDispatcher.await(); // Wait till all map-attempts request for containers for (Task t : job.getTasks().values()) { - mrApp.waitForState(t.getAttempts().values().iterator().next(), - TaskAttemptState.UNASSIGNED); + mrApp.waitForInternalState((TaskAttemptImpl) t.getAttempts().values() + .iterator().next(), TaskAttemptStateInternal.UNASSIGNED); } amDispatcher.await(); Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TestJobImpl.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/job/impl/TestJobImpl.java?rev=1399976&r1=1399975&r2=1399976&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TestJobImpl.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TestJobImpl.java Fri Oct 19 05:57:57 2012 @@ -42,8 +42,8 @@ import org.apache.hadoop.mapreduce.jobhi import org.apache.hadoop.mapreduce.security.token.JobTokenSecretManager; import org.apache.hadoop.mapreduce.split.JobSplit.TaskSplitMetaInfo; import org.apache.hadoop.mapreduce.v2.api.records.JobId; -import org.apache.hadoop.mapreduce.v2.api.records.JobState; import org.apache.hadoop.mapreduce.v2.api.records.TaskId; +import org.apache.hadoop.mapreduce.v2.app.job.JobStateInternal; import org.apache.hadoop.mapreduce.v2.app.job.Task; import org.apache.hadoop.mapreduce.v2.app.job.event.JobDiagnosticsUpdateEvent; import org.apache.hadoop.mapreduce.v2.app.job.event.JobEvent; @@ -77,11 +77,11 @@ public class TestJobImpl { tasks.put(mockTask.getID(), mockTask); mockJob.tasks = tasks; - when(mockJob.getState()).thenReturn(JobState.ERROR); + when(mockJob.getInternalState()).thenReturn(JobStateInternal.ERROR); JobEvent mockJobEvent = mock(JobEvent.class); - JobState state = trans.transition(mockJob, mockJobEvent); + JobStateInternal state = trans.transition(mockJob, mockJobEvent); Assert.assertEquals("Incorrect state returned from JobNoTasksCompletedTransition", - JobState.ERROR, state); + JobStateInternal.ERROR, state); } @Test @@ -96,9 +96,12 @@ public class TestJobImpl { when(mockJob.getCommitter()).thenReturn(mockCommitter); when(mockJob.getEventHandler()).thenReturn(mockEventHandler); when(mockJob.getJobContext()).thenReturn(mockJobContext); - when(mockJob.finished(JobState.KILLED)).thenReturn(JobState.KILLED); - when(mockJob.finished(JobState.FAILED)).thenReturn(JobState.FAILED); - when(mockJob.finished(JobState.SUCCEEDED)).thenReturn(JobState.SUCCEEDED); + when(mockJob.finished(JobStateInternal.KILLED)).thenReturn( + JobStateInternal.KILLED); + when(mockJob.finished(JobStateInternal.FAILED)).thenReturn( + JobStateInternal.FAILED); + when(mockJob.finished(JobStateInternal.SUCCEEDED)).thenReturn( + JobStateInternal.SUCCEEDED); try { doThrow(new IOException()).when(mockCommitter).commitJob(any(JobContext.class)); @@ -106,11 +109,11 @@ public class TestJobImpl { // commitJob stubbed out, so this can't happen } doNothing().when(mockEventHandler).handle(any(JobHistoryEvent.class)); - JobState jobState = JobImpl.checkJobCompleteSuccess(mockJob); + JobStateInternal jobState = JobImpl.checkJobCompleteSuccess(mockJob); Assert.assertNotNull("checkJobCompleteSuccess incorrectly returns null " + "for successful job", jobState); Assert.assertEquals("checkJobCompleteSuccess returns incorrect state", - JobState.FAILED, jobState); + JobStateInternal.FAILED, jobState); verify(mockJob).abortJob( eq(org.apache.hadoop.mapreduce.JobStatus.State.FAILED)); } @@ -129,7 +132,8 @@ public class TestJobImpl { when(mockJob.getJobContext()).thenReturn(mockJobContext); doNothing().when(mockJob).setFinishTime(); doNothing().when(mockJob).logJobHistoryFinishedEvent(); - when(mockJob.finished(any(JobState.class))).thenReturn(JobState.SUCCEEDED); + when(mockJob.finished(any(JobStateInternal.class))).thenReturn( + JobStateInternal.SUCCEEDED); try { doNothing().when(mockCommitter).commitJob(any(JobContext.class)); @@ -141,7 +145,7 @@ public class TestJobImpl { "for successful job", JobImpl.checkJobCompleteSuccess(mockJob)); Assert.assertEquals("checkJobCompleteSuccess returns incorrect state", - JobState.SUCCEEDED, JobImpl.checkJobCompleteSuccess(mockJob)); + JobStateInternal.SUCCEEDED, JobImpl.checkJobCompleteSuccess(mockJob)); } @Test Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TestTaskImpl.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/job/impl/TestTaskImpl.java?rev=1399976&r1=1399975&r2=1399976&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TestTaskImpl.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TestTaskImpl.java Fri Oct 19 05:57:57 2012 @@ -26,7 +26,6 @@ import static org.mockito.Mockito.when; import java.io.IOException; import java.util.ArrayList; -import java.util.Collection; import java.util.List; import java.util.Map; @@ -48,13 +47,13 @@ import org.apache.hadoop.mapreduce.v2.ap import org.apache.hadoop.mapreduce.v2.api.records.TaskType; import org.apache.hadoop.mapreduce.v2.app.AppContext; import org.apache.hadoop.mapreduce.v2.app.TaskAttemptListener; +import org.apache.hadoop.mapreduce.v2.app.job.TaskStateInternal; import org.apache.hadoop.mapreduce.v2.app.job.event.TaskEvent; import org.apache.hadoop.mapreduce.v2.app.job.event.TaskEventType; import org.apache.hadoop.mapreduce.v2.app.job.event.TaskTAttemptEvent; import org.apache.hadoop.mapreduce.v2.app.metrics.MRAppMetrics; import org.apache.hadoop.security.Credentials; import org.apache.hadoop.security.token.Token; -import org.apache.hadoop.security.token.TokenIdentifier; import org.apache.hadoop.yarn.Clock; import org.apache.hadoop.yarn.SystemClock; import org.apache.hadoop.yarn.api.records.ApplicationId; @@ -338,7 +337,7 @@ public class TestTaskImpl { * {@link TaskState#KILL_WAIT} */ private void assertTaskKillWaitState() { - assertEquals(TaskState.KILL_WAIT, mockTask.getState()); + assertEquals(TaskStateInternal.KILL_WAIT, mockTask.getInternalState()); } /** Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/launcher/TestContainerLauncher.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/launcher/TestContainerLauncher.java?rev=1399976&r1=1399975&r2=1399976&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/launcher/TestContainerLauncher.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/launcher/TestContainerLauncher.java Fri Oct 19 05:57:57 2012 @@ -46,6 +46,8 @@ import org.apache.hadoop.mapreduce.v2.ap import org.apache.hadoop.mapreduce.v2.app.job.Job; import org.apache.hadoop.mapreduce.v2.app.job.Task; import org.apache.hadoop.mapreduce.v2.app.job.TaskAttempt; +import org.apache.hadoop.mapreduce.v2.app.job.TaskAttemptStateInternal; +import org.apache.hadoop.mapreduce.v2.app.job.impl.TaskAttemptImpl; import org.apache.hadoop.mapreduce.v2.util.MRBuilderUtils; import org.apache.hadoop.net.NetUtils; import org.apache.hadoop.yarn.api.ContainerManager; @@ -260,7 +262,8 @@ public class TestContainerLauncher { attempts.size()); TaskAttempt attempt = attempts.values().iterator().next(); - app.waitForState(attempt, TaskAttemptState.ASSIGNED); + app.waitForInternalState((TaskAttemptImpl) attempt, + TaskAttemptStateInternal.ASSIGNED); app.waitForState(job, JobState.FAILED); Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java?rev=1399976&r1=1399975&r2=1399976&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java Fri Oct 19 05:57:57 2012 @@ -128,14 +128,26 @@ public class TypeConverter { return taskId; } - public static TaskAttemptState toYarn(org.apache.hadoop.mapred.TaskStatus.State state) { - if (state == org.apache.hadoop.mapred.TaskStatus.State.KILLED_UNCLEAN) { - return TaskAttemptState.KILLED; - } - if (state == org.apache.hadoop.mapred.TaskStatus.State.FAILED_UNCLEAN) { + public static TaskAttemptState toYarn( + org.apache.hadoop.mapred.TaskStatus.State state) { + switch (state) { + case COMMIT_PENDING: + return TaskAttemptState.COMMIT_PENDING; + case FAILED: + case FAILED_UNCLEAN: return TaskAttemptState.FAILED; + case KILLED: + case KILLED_UNCLEAN: + return TaskAttemptState.KILLED; + case RUNNING: + return TaskAttemptState.RUNNING; + case SUCCEEDED: + return TaskAttemptState.SUCCEEDED; + case UNASSIGNED: + return TaskAttemptState.STARTING; + default: + throw new YarnException("Unrecognized State: " + state); } - return TaskAttemptState.valueOf(state.toString()); } public static Phase toYarn(org.apache.hadoop.mapred.TaskStatus.Phase phase) { @@ -309,7 +321,6 @@ public class TypeConverter { return org.apache.hadoop.mapred.JobStatus.PREP; case RUNNING: return org.apache.hadoop.mapred.JobStatus.RUNNING; - case KILL_WAIT: case KILLED: return org.apache.hadoop.mapred.JobStatus.KILLED; case SUCCEEDED: @@ -329,7 +340,6 @@ public class TypeConverter { return org.apache.hadoop.mapred.TIPStatus.PENDING; case RUNNING: return org.apache.hadoop.mapred.TIPStatus.RUNNING; - case KILL_WAIT: case KILLED: return org.apache.hadoop.mapred.TIPStatus.KILLED; case SUCCEEDED: Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/api/records/JobState.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/api/records/JobState.java?rev=1399976&r1=1399975&r2=1399976&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/api/records/JobState.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/api/records/JobState.java Fri Oct 19 05:57:57 2012 @@ -24,7 +24,6 @@ public enum JobState { RUNNING, SUCCEEDED, FAILED, - KILL_WAIT, KILLED, ERROR } Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/api/records/TaskAttemptState.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/api/records/TaskAttemptState.java?rev=1399976&r1=1399975&r2=1399976&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/api/records/TaskAttemptState.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/api/records/TaskAttemptState.java Fri Oct 19 05:57:57 2012 @@ -20,16 +20,10 @@ package org.apache.hadoop.mapreduce.v2.a public enum TaskAttemptState { NEW, - UNASSIGNED, - ASSIGNED, + STARTING, RUNNING, - COMMIT_PENDING, - SUCCESS_CONTAINER_CLEANUP, - SUCCEEDED, - FAIL_CONTAINER_CLEANUP, - FAIL_TASK_CLEANUP, - FAILED, - KILL_CONTAINER_CLEANUP, - KILL_TASK_CLEANUP, + COMMIT_PENDING, + SUCCEEDED, + FAILED, KILLED } Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/api/records/TaskState.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/api/records/TaskState.java?rev=1399976&r1=1399975&r2=1399976&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/api/records/TaskState.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/api/records/TaskState.java Fri Oct 19 05:57:57 2012 @@ -19,5 +19,5 @@ package org.apache.hadoop.mapreduce.v2.api.records; public enum TaskState { - NEW, SCHEDULED, RUNNING, SUCCEEDED, FAILED, KILL_WAIT, KILLED + NEW, SCHEDULED, RUNNING, SUCCEEDED, FAILED, KILLED } Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/util/MRApps.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/util/MRApps.java?rev=1399976&r1=1399975&r2=1399976&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/util/MRApps.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/util/MRApps.java Fri Oct 19 05:57:57 2012 @@ -49,8 +49,8 @@ import org.apache.hadoop.mapreduce.v2.ap import org.apache.hadoop.mapreduce.v2.api.records.TaskType; import org.apache.hadoop.yarn.ContainerLogAppender; import org.apache.hadoop.yarn.YarnException; -import org.apache.hadoop.yarn.api.ApplicationConstants.Environment; import org.apache.hadoop.yarn.api.ApplicationConstants; +import org.apache.hadoop.yarn.api.ApplicationConstants.Environment; import org.apache.hadoop.yarn.api.records.LocalResource; import org.apache.hadoop.yarn.api.records.LocalResourceType; import org.apache.hadoop.yarn.api.records.LocalResourceVisibility; @@ -100,15 +100,10 @@ public class MRApps extends Apps { public static enum TaskAttemptStateUI { NEW( new TaskAttemptState[] { TaskAttemptState.NEW, - TaskAttemptState.UNASSIGNED, TaskAttemptState.ASSIGNED }), + TaskAttemptState.STARTING }), RUNNING( new TaskAttemptState[] { TaskAttemptState.RUNNING, - TaskAttemptState.COMMIT_PENDING, - TaskAttemptState.SUCCESS_CONTAINER_CLEANUP, - TaskAttemptState.FAIL_CONTAINER_CLEANUP, - TaskAttemptState.FAIL_TASK_CLEANUP, - TaskAttemptState.KILL_CONTAINER_CLEANUP, - TaskAttemptState.KILL_TASK_CLEANUP }), + TaskAttemptState.COMMIT_PENDING }), SUCCESSFUL(new TaskAttemptState[] { TaskAttemptState.SUCCEEDED}), FAILED(new TaskAttemptState[] { TaskAttemptState.FAILED}), KILLED(new TaskAttemptState[] { TaskAttemptState.KILLED}); Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/proto/mr_protos.proto URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/proto/mr_protos.proto?rev=1399976&r1=1399975&r2=1399976&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/proto/mr_protos.proto (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/proto/mr_protos.proto Fri Oct 19 05:57:57 2012 @@ -50,8 +50,7 @@ enum TaskStateProto { TS_RUNNING = 3; TS_SUCCEEDED = 4; TS_FAILED = 5; - TS_KILL_WAIT = 6; - TS_KILLED = 7; + TS_KILLED = 6; } enum PhaseProto { @@ -93,18 +92,12 @@ message TaskReportProto { enum TaskAttemptStateProto { TA_NEW = 1; - TA_UNASSIGNED = 2; - TA_ASSIGNED = 3; - TA_RUNNING = 4; - TA_COMMIT_PENDING = 5; - TA_SUCCESS_CONTAINER_CLEANUP = 6; - TA_SUCCEEDED = 7; - TA_FAIL_CONTAINER_CLEANUP = 8; - TA_FAIL_TASK_CLEANUP = 9; - TA_FAILED = 10; - TA_KILL_CONTAINER_CLEANUP = 11; - TA_KILL_TASK_CLEANUP = 12; - TA_KILLED = 13; + TA_STARTING = 2; + TA_RUNNING = 3; + TA_COMMIT_PENDING = 4; + TA_SUCCEEDED = 5; + TA_FAILED = 6; + TA_KILLED = 7; } message TaskAttemptReportProto { @@ -131,9 +124,8 @@ enum JobStateProto { J_RUNNING = 3; J_SUCCEEDED = 4; J_FAILED = 5; - J_KILL_WAIT = 6; - J_KILLED = 7; - J_ERROR = 8; + J_KILLED = 6; + J_ERROR = 7; } message JobReportProto {
