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

MAPREDUCE-6286. A typo in HistoryViewer makes some code useless, which causes counter limits are not reset correctly. Contributed by Zhihai Xu. 

(cherry picked from commit 433542904a)
This commit is contained in:
Harsh J 2015-03-22 02:51:02 +05:30
parent 418d078bc5
commit 7c72c7f529
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,6 +38,10 @@ Release 2.8.0 - UNRELEASED
BUG FIXES BUG FIXES
MAPREDUCE-6286. A typo in HistoryViewer makes some code useless, which
causes counter limits are not reset correctly.
(Zhihai Xu via harsh)
MAPREDUCE-6213. NullPointerException caused by job history server addr not MAPREDUCE-6213. NullPointerException caused by job history server addr not
resolvable. (Peng Zhang via harsh) resolvable. (Peng Zhang via harsh)

2
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/HistoryViewer.java
View File

@ -93,7 +93,7 @@ public class HistoryViewer {
final Configuration jobConf = new Configuration(conf); final Configuration jobConf = new Configuration(conf);
try { try {
jobConf.addResource(fs.open(jobConfPath), jobConfPath.toString()); jobConf.addResource(fs.open(jobConfPath), jobConfPath.toString());
Limits.reset(conf); Limits.reset(jobConf);
} catch (FileNotFoundException fnf) { } catch (FileNotFoundException fnf) {
if (LOG.isWarnEnabled()) { if (LOG.isWarnEnabled()) {
LOG.warn("Missing job conf in history", fnf); LOG.warn("Missing job conf in history", fnf);