浏览代码

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 7c72c7f5290f0991f65102c2bd413f965a8ca409.

Conflicts:
	hadoop-mapreduce-project/CHANGES.txt
Junping Du 8 年之前
父节点
当前提交
e8d7801319

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