Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn merge -c 1414840 FIXES: MAPREDUCE-4825. JobImpl.finished doesn't expect ERROR as a final job state (jlowe via bobby) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1414842 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Joseph Evans 2012-11-28 17:54:10 +00:00
parent 3eedaed911
commit 3e0d0cf08f
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -449,6 +449,9 @@ Release 0.23.6 - UNRELEASED
MAPREDUCE-4764. repair TestBinaryTokenFile (Ivan A. Veselovsky via bobby) MAPREDUCE-4764. repair TestBinaryTokenFile (Ivan A. Veselovsky via bobby)
MAPREDUCE-4825. JobImpl.finished doesn't expect ERROR as a final job state
(jlowe via bobby)
Release 0.23.5 - UNRELEASED Release 0.23.5 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

1
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java
View File

@ -828,6 +828,7 @@ public class JobImpl implements org.apache.hadoop.mapreduce.v2.app.job.Job,
case KILLED: case KILLED:
metrics.killedJob(this); metrics.killedJob(this);
break; break;
case ERROR:
case FAILED: case FAILED:
metrics.failedJob(this); metrics.failedJob(this);
break; break;