[1/3] 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."

2017-07-31 Thread junping_du 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 8c6358098 -> cae33098e


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.


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

Branch: refs/heads/branch-2
Commit: c0f8fd6432684d8e4b66561cbe7c5b8a38299de7
Parents: 8c635809
Author: Junping Du 
Authored: Mon Jul 31 14:11:37 2017 -0700
Committer: Junping Du 
Committed: Mon Jul 31 14:11:37 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/c0f8fd64/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-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[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."

2017-07-31 Thread xgong 
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 
Authored: Fri Jul 28 14:06:59 2017 -0700
Committer: Junping Du 
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-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

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

2017-07-28 Thread junping_du 
Repository: hadoop
Updated Branches:
  refs/heads/trunk 746189ad8 -> e15f92829


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/trunk
Commit: e15f92829558cc4a30b10f2fccfd17c2f8088003
Parents: 746189a
Author: Junping Du 
Authored: Fri Jul 28 14:06:59 2017 -0700
Committer: Junping Du 
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-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[1/3] 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."

2016-12-28 Thread junping_du 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.8 e25363300 -> 5f36b6226


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


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

Branch: refs/heads/branch-2.8
Commit: e8d78013197735efc3d2dbede5a8f922169eb41a
Parents: e253633
Author: Junping Du 
Authored: Wed Dec 28 17:05:17 2016 -0800
Committer: Junping Du 
Committed: Wed Dec 28 17:05:17 2016 -0800

--
 .../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/e8d78013/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 bbb08de..5a55aba 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);


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

[1/3] 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.

2015-03-31 Thread vinodkv 
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);