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

MAPREDUCE-5837. Merge r1589903 from trunk. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589904 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Haohui Mai 2014-04-24 22:55:25 +00:00
parent 91aad1c7bd
commit 1566fff15f
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,6 +51,8 @@ Release 2.5.0 - UNRELEASED
MAPREDUCE-5846. Rumen doesn't understand JobQueueChangedEvent (Nathan Roberts via raviprak)
MAPREDUCE-5837. MRAppMaster fails when checking on uber mode. (wheat9)
Release 2.4.1 - UNRELEASED
INCOMPATIBLE CHANGES

2
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

@ -1288,6 +1288,7 @@ public class JobImpl implements org.apache.hadoop.mapreduce.v2.app.job.Job,
}
} catch (ClassNotFoundException cnfe) {
// don't care; assume it's not derived from ChainMapper
} catch (NoClassDefFoundError ignored) {
}
try {
String reduceClassName = conf.get(MRJobConfig.REDUCE_CLASS_ATTR);
@ -1298,6 +1299,7 @@ public class JobImpl implements org.apache.hadoop.mapreduce.v2.app.job.Job,
}
} catch (ClassNotFoundException cnfe) {
// don't care; assume it's not derived from ChainReducer
} catch (NoClassDefFoundError ignored) {
}
return isChainJob;
}