Author: sseth
Date: Fri Oct 19 18:43:46 2012
New Revision: 1400217
URL: http://svn.apache.org/viewvc?rev=1400217&view=rev
Log:
Reverted changes to TaskAttemptState and mr_protos to facilitate clean merge
from trunk (sseth)
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
hadoop/common/branches/MR-3902/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/proto/mr_protos.proto
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=1400217&r1=1400216&r2=1400217&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
Fri Oct 19 18:43:46 2012
@@ -19,31 +19,17 @@
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=1400217&r1=1400216&r2=1400217&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
Fri Oct 19 18:43:46 2012
@@ -105,9 +105,6 @@ 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 {
