Modified: hadoop/common/branches/MR-3902/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/branches/MR-3902/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/api/records/TaskAttemptState.java?rev=1376283&r1=1376282&r2=1376283&view=diff ============================================================================== --- hadoop/common/branches/MR-3902/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/branches/MR-3902/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/api/records/TaskAttemptState.java Wed Aug 22 22:11:39 2012 @@ -19,17 +19,31 @@ package org.apache.hadoop.mapreduce.v2.api.records; public enum TaskAttemptState { + // States in new implementation. NEW, + START_WAIT, + RUNNING, + COMMIT_PENDING, + KILLED, + FAILED, + KILL_IN_PROGRESS, + FAIL_IN_PROGRESS, + SUCCEEDED, + + + // States in old implementation. + // NEW, UNASSIGNED, ASSIGNED, - RUNNING, - COMMIT_PENDING, + // RUNNING, + // COMMIT_PENDING, SUCCESS_CONTAINER_CLEANUP, - SUCCEEDED, + // SUCCEEDED, FAIL_CONTAINER_CLEANUP, FAIL_TASK_CLEANUP, - FAILED, + // FAILED, KILL_CONTAINER_CLEANUP, KILL_TASK_CLEANUP, - KILLED + // KILLED + }
Modified: hadoop/common/branches/MR-3902/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/proto/mr_protos.proto URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-3902/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/proto/mr_protos.proto?rev=1376283&r1=1376282&r2=1376283&view=diff ============================================================================== --- hadoop/common/branches/MR-3902/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/proto/mr_protos.proto (original) +++ hadoop/common/branches/MR-3902/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/proto/mr_protos.proto Wed Aug 22 22:11:39 2012 @@ -105,6 +105,9 @@ enum TaskAttemptStateProto { TA_KILL_CONTAINER_CLEANUP = 11; TA_KILL_TASK_CLEANUP = 12; TA_KILLED = 13; + TA_START_WAIT=14; + TA_KILL_IN_PROGRESS=15; + TA_FAIL_IN_PROGRESS=16; } message TaskAttemptReportProto { Modified: hadoop/common/branches/MR-3902/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-3902/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java?rev=1376283&r1=1376282&r2=1376283&view=diff ============================================================================== --- hadoop/common/branches/MR-3902/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java (original) +++ hadoop/common/branches/MR-3902/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java Wed Aug 22 22:11:39 2012 @@ -536,8 +536,10 @@ public interface MRJobConfig { public static final String JOB_SPLIT_METAINFO = "job.splitmetainfo"; - public static final String APPLICATION_MASTER_CLASS = - "org.apache.hadoop.mapreduce.v2.app.MRAppMaster"; + + + public static final String APPLICATION_MASTER_CLASS = MR_AM_PREFIX + "class"; + public static final String DEFAULT_APPLICATION_MASTER_CLASS = "org.apache.hadoop.mapreduce.v2.app.MRAppMaster"; // The token file for the application. Should contain tokens for access to // remote file system and may optionally contain application specific tokens. Modified: hadoop/common/branches/MR-3902/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/YARNRunner.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-3902/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/YARNRunner.java?rev=1376283&r1=1376282&r2=1376283&view=diff ============================================================================== --- hadoop/common/branches/MR-3902/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/YARNRunner.java (original) +++ hadoop/common/branches/MR-3902/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/YARNRunner.java Wed Aug 22 22:11:39 2012 @@ -388,6 +388,7 @@ public class YARNRunner implements Clien vargs.add(conf.get(MRJobConfig.MR_AM_COMMAND_OPTS, MRJobConfig.DEFAULT_MR_AM_COMMAND_OPTS)); + vargs.add(jobConf.get(MRJobConfig.APPLICATION_MASTER_CLASS, MRJobConfig.DEFAULT_APPLICATION_MASTER_CLASS)); vargs.add(MRJobConfig.APPLICATION_MASTER_CLASS); vargs.add("1>" + ApplicationConstants.LOG_DIR_EXPANSION_VAR + Path.SEPARATOR + ApplicationConstants.STDOUT); Modified: hadoop/common/branches/MR-3902/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-3902/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml?rev=1376283&r1=1376282&r2=1376283&view=diff ============================================================================== --- hadoop/common/branches/MR-3902/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml (original) +++ hadoop/common/branches/MR-3902/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml Wed Aug 22 22:11:39 2012 @@ -156,6 +156,7 @@ <module>hadoop-mapreduce-client-common</module> <module>hadoop-mapreduce-client-shuffle</module> <module>hadoop-mapreduce-client-app</module> + <module>hadoop-mapreduce-client-app2</module> <module>hadoop-mapreduce-client-jobclient</module> <module>hadoop-mapreduce-client-hs</module> </modules>
