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.

This commit is contained in:
Harsh J 2015-03-22 10:18:32 +05:30
parent 08f2f7ed34
commit 929b04ce3a
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

@ -97,6 +97,10 @@ Release 2.7.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-6210. Use getApplicationAttemptId() instead of getApplicationId() MAPREDUCE-6210. Use getApplicationAttemptId() instead of getApplicationId()
for logging AttemptId in RMContainerAllocator.java (Leitao Guo via aajisaka) for logging AttemptId in RMContainerAllocator.java (Leitao Guo via aajisaka)

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);