hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xg...@apache.org
Subject [36/50] [abbrv] hadoop git commit: Revert "MAPREDUCE-6286. A typo in HistoryViewer makes some code useless, which causes counter limits are not reset correctly. Contributed by Zhihai Xu."
Date Mon, 31 Jul 2017 16:01:08 GMT
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 433542904aba5ddebf9bd9d299378647351eb13a.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e15f9282
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e15f9282
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e15f9282

Branch: refs/heads/YARN-5734
Commit: e15f92829558cc4a30b10f2fccfd17c2f8088003
Parents: 746189a
Author: Junping Du <junping_du@apache.org>
Authored: Fri Jul 28 14:06:59 2017 -0700
Committer: Junping Du <junping_du@apache.org>
Committed: Fri Jul 28 14:06:59 2017 -0700

----------------------------------------------------------------------
 .../java/org/apache/hadoop/mapreduce/jobhistory/HistoryViewer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/e15f9282/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 e5db2e5..25c0630 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
@@ -94,7 +94,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);


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message