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

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

Browse Source 
This reverts commit 7c72c7f5290f0991f65102c2bd413f965a8ca409.

Conflicts:
	hadoop-mapreduce-project/CHANGES.txt
This commit is contained in:
Junping Du 2016-12-28 17:05:17 -08:00
parent e253633009
commit e8d7801319
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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 HistoryViewer(String historyFile,
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(jobConf); Limits.reset(conf);
} 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);