Repository: hadoop Updated Branches: refs/heads/branch-2.7 96d04307f -> ec123abdc
Revert "MAPREDUCE-6286. A typo in HistoryViewer makes some code useless, which causes counter limits are not reset correctly. Contributed by Zhihai Xu." This reverts commit 929b04ce3a4fe419dece49ed68d4f6228be214c1. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/02646ddb Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/02646ddb Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/02646ddb Branch: refs/heads/branch-2.7 Commit: 02646ddba291665efde76f8496260d91b5a27003 Parents: 96d0430 Author: Vinod Kumar Vavilapalli <vino...@apache.org> Authored: Tue Mar 31 11:26:13 2015 -0700 Committer: Vinod Kumar Vavilapalli <vino...@apache.org> Committed: Tue Mar 31 11:26:13 2015 -0700 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 4 ---- .../org/apache/hadoop/mapreduce/jobhistory/HistoryViewer.java | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/02646ddb/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index da29b4e..ef0a964 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -100,10 +100,6 @@ Release 2.7.0 - UNRELEASED 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() for logging AttemptId in RMContainerAllocator.java (Leitao Guo via aajisaka) http://git-wip-us.apache.org/repos/asf/hadoop/blob/02646ddb/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/HistoryViewer.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/HistoryViewer.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/HistoryViewer.java index f343d7c..43b2df2 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/HistoryViewer.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/HistoryViewer.java @@ -93,7 +93,7 @@ public class HistoryViewer { final Configuration jobConf = new Configuration(conf); try { jobConf.addResource(fs.open(jobConfPath), jobConfPath.toString()); - Limits.reset(jobConf); + Limits.reset(conf); } catch (FileNotFoundException fnf) { if (LOG.isWarnEnabled()) { LOG.warn("Missing job conf in history", fnf);
