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

View File

@ -449,6 +449,9 @@ Release 0.23.6 - UNRELEASED
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
INCOMPATIBLE CHANGES

View File

@ -828,6 +828,7 @@ JobStateInternal finished(JobStateInternal finalState) {
case KILLED:
metrics.killedJob(this);
break;
case ERROR:
case FAILED:
metrics.failedJob(this);
break;