hadoop git commit: HDFS-7890. Improve information on Top users for metrics in RollingWindowsManager and lower log level (Contributed by J.Andreina)

2015-03-29 Thread vinayakumarb
Repository: hadoop
Updated Branches:
  refs/heads/trunk 232eca944 - 1ed9fb766


HDFS-7890. Improve information on Top users for metrics in 
RollingWindowsManager and lower log level (Contributed by J.Andreina)


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

Branch: refs/heads/trunk
Commit: 1ed9fb76645ecd195afe0067497dca10a3fb997d
Parents: 232eca9
Author: Vinayakumar B vinayakum...@apache.org
Authored: Mon Mar 30 10:02:48 2015 +0530
Committer: Vinayakumar B vinayakum...@apache.org
Committed: Mon Mar 30 10:02:48 2015 +0530

--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt   | 3 +++
 .../hdfs/server/namenode/top/window/RollingWindowManager.java | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/1ed9fb76/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index f4991da..9b1cc3e 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -353,6 +353,9 @@ Release 2.8.0 - UNRELEASED
 HDFS-6408. Remove redundant definitions in log4j.properties.
 (Abhiraj Butala via aajisaka)
 
+HDFS-7890. Improve information on Top users for metrics in
+RollingWindowsManager and lower log level (J.Andreina via vinayakumarb)
+
   OPTIMIZATIONS
 
   BUG FIXES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/1ed9fb76/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/top/window/RollingWindowManager.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/top/window/RollingWindowManager.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/top/window/RollingWindowManager.java
index 00e7087..4759cc8 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/top/window/RollingWindowManager.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/top/window/RollingWindowManager.java
@@ -245,7 +245,7 @@ public class RollingWindowManager {
   metricName, userName, windowSum);
   topN.offer(new NameValuePair(userName, windowSum));
 }
-LOG.info(topN size for command {} is: {}, metricName, topN.size());
+LOG.debug(topN users size for command {} is: {}, metricName, 
topN.size());
 return topN;
   }
 



hadoop git commit: HDFS-6408. Remove redundant definitions in log4j.properties. Contributed by Abhiraj Butala.

2015-03-29 Thread aajisaka
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 a79a38d09 - 7aded71f3


HDFS-6408. Remove redundant definitions in log4j.properties. Contributed by 
Abhiraj Butala.

(cherry picked from commit 232eca944a721c62f37e9012546a7fa814da6e01)


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

Branch: refs/heads/branch-2
Commit: 7aded71f3ab436519efa9b6c2071b3f748a45d54
Parents: a79a38d
Author: Akira Ajisaka aajis...@apache.org
Authored: Mon Mar 30 11:25:35 2015 +0900
Committer: Akira Ajisaka aajis...@apache.org
Committed: Mon Mar 30 11:26:11 2015 +0900

--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
 .../src/contrib/bkjournal/src/test/resources/log4j.properties   | 5 -
 2 files changed, 3 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/7aded71f/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 1f2fcc8..4e93a1d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -35,6 +35,9 @@ Release 2.8.0 - UNRELEASED
 HDFS-6263. Remove DRFA.MaxBackupIndex config from log4j.properties.
 (Abhiraj Butala via aajisaka)
 
+HDFS-6408. Remove redundant definitions in log4j.properties.
+(Abhiraj Butala via aajisaka)
+
   OPTIMIZATIONS
 
   BUG FIXES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/7aded71f/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/resources/log4j.properties
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/resources/log4j.properties
 
b/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/resources/log4j.properties
index f66c84b..93c22f7 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/resources/log4j.properties
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/resources/log4j.properties
@@ -53,8 +53,3 @@ 
log4j.appender.ROLLINGFILE.layout.ConversionPattern=%d{ISO8601} - %-5p - [%t:%C{
 
 # Max log file size of 10MB
 log4j.appender.ROLLINGFILE.MaxFileSize=10MB
-
-log4j.appender.ROLLINGFILE.layout=org.apache.log4j.PatternLayout
-log4j.appender.ROLLINGFILE.layout.ConversionPattern=%d{ISO8601} - %-5p 
[%t:%C{1}@%L] - %m%n
-
-



hadoop git commit: HDFS-6408. Remove redundant definitions in log4j.properties. Contributed by Abhiraj Butala.

2015-03-29 Thread aajisaka
Repository: hadoop
Updated Branches:
  refs/heads/trunk 257c77f89 - 232eca944


HDFS-6408. Remove redundant definitions in log4j.properties. Contributed by 
Abhiraj Butala.


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

Branch: refs/heads/trunk
Commit: 232eca944a721c62f37e9012546a7fa814da6e01
Parents: 257c77f
Author: Akira Ajisaka aajis...@apache.org
Authored: Mon Mar 30 11:25:35 2015 +0900
Committer: Akira Ajisaka aajis...@apache.org
Committed: Mon Mar 30 11:25:35 2015 +0900

--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
 .../src/contrib/bkjournal/src/test/resources/log4j.properties   | 5 -
 2 files changed, 3 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/232eca94/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index e026f85..f4991da 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -350,6 +350,9 @@ Release 2.8.0 - UNRELEASED
 HDFS-6263. Remove DRFA.MaxBackupIndex config from log4j.properties.
 (Abhiraj Butala via aajisaka)
 
+HDFS-6408. Remove redundant definitions in log4j.properties.
+(Abhiraj Butala via aajisaka)
+
   OPTIMIZATIONS
 
   BUG FIXES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/232eca94/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/resources/log4j.properties
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/resources/log4j.properties
 
b/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/resources/log4j.properties
index f66c84b..93c22f7 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/resources/log4j.properties
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/resources/log4j.properties
@@ -53,8 +53,3 @@ 
log4j.appender.ROLLINGFILE.layout.ConversionPattern=%d{ISO8601} - %-5p - [%t:%C{
 
 # Max log file size of 10MB
 log4j.appender.ROLLINGFILE.MaxFileSize=10MB
-
-log4j.appender.ROLLINGFILE.layout=org.apache.log4j.PatternLayout
-log4j.appender.ROLLINGFILE.layout.ConversionPattern=%d{ISO8601} - %-5p 
[%t:%C{1}@%L] - %m%n
-
-



hadoop git commit: HDFS-6263. Remove DRFA.MaxBackupIndex config from log4j.properties. Contributed by Abhiraj Butala.

2015-03-29 Thread aajisaka
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 b679dc5a8 - a79a38d09


HDFS-6263. Remove DRFA.MaxBackupIndex config from log4j.properties. Contributed 
by Abhiraj Butala.

(cherry picked from commit 257c77f895e8e4c3d8748909ebbd3ba7e7f880fc)


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

Branch: refs/heads/branch-2
Commit: a79a38d096b1f96b883ff8a4827f9b09f8af25a7
Parents: b679dc5
Author: Akira Ajisaka aajis...@apache.org
Authored: Mon Mar 30 10:52:15 2015 +0900
Committer: Akira Ajisaka aajis...@apache.org
Committed: Mon Mar 30 10:52:45 2015 +0900

--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt   | 3 +++
 .../src/contrib/bkjournal/src/test/resources/log4j.properties | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/a79a38d0/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 1391b72..1f2fcc8 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -32,6 +32,9 @@ Release 2.8.0 - UNRELEASED
 HDFS-8004. Use KeyProviderCryptoExtension#warmUpEncryptedKeys when creating
 an encryption zone. (awang via asuresh)
 
+HDFS-6263. Remove DRFA.MaxBackupIndex config from log4j.properties.
+(Abhiraj Butala via aajisaka)
+
   OPTIMIZATIONS
 
   BUG FIXES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/a79a38d0/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/resources/log4j.properties
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/resources/log4j.properties
 
b/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/resources/log4j.properties
index 8a6b217..f66c84b 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/resources/log4j.properties
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/resources/log4j.properties
@@ -53,8 +53,6 @@ 
log4j.appender.ROLLINGFILE.layout.ConversionPattern=%d{ISO8601} - %-5p - [%t:%C{
 
 # Max log file size of 10MB
 log4j.appender.ROLLINGFILE.MaxFileSize=10MB
-# uncomment the next line to limit number of backup files
-#log4j.appender.ROLLINGFILE.MaxBackupIndex=10
 
 log4j.appender.ROLLINGFILE.layout=org.apache.log4j.PatternLayout
 log4j.appender.ROLLINGFILE.layout.ConversionPattern=%d{ISO8601} - %-5p 
[%t:%C{1}@%L] - %m%n



hadoop git commit: HDFS-6263. Remove DRFA.MaxBackupIndex config from log4j.properties. Contributed by Abhiraj Butala.

2015-03-29 Thread aajisaka
Repository: hadoop
Updated Branches:
  refs/heads/trunk 3d9132d43 - 257c77f89


HDFS-6263. Remove DRFA.MaxBackupIndex config from log4j.properties. Contributed 
by Abhiraj Butala.


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

Branch: refs/heads/trunk
Commit: 257c77f895e8e4c3d8748909ebbd3ba7e7f880fc
Parents: 3d9132d
Author: Akira Ajisaka aajis...@apache.org
Authored: Mon Mar 30 10:52:15 2015 +0900
Committer: Akira Ajisaka aajis...@apache.org
Committed: Mon Mar 30 10:52:15 2015 +0900

--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt   | 3 +++
 .../src/contrib/bkjournal/src/test/resources/log4j.properties | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/257c77f8/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 496db06..e026f85 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -347,6 +347,9 @@ Release 2.8.0 - UNRELEASED
 HDFS-8004. Use KeyProviderCryptoExtension#warmUpEncryptedKeys when creating
 an encryption zone. (awang via asuresh)
 
+HDFS-6263. Remove DRFA.MaxBackupIndex config from log4j.properties.
+(Abhiraj Butala via aajisaka)
+
   OPTIMIZATIONS
 
   BUG FIXES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/257c77f8/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/resources/log4j.properties
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/resources/log4j.properties
 
b/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/resources/log4j.properties
index 8a6b217..f66c84b 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/resources/log4j.properties
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/resources/log4j.properties
@@ -53,8 +53,6 @@ 
log4j.appender.ROLLINGFILE.layout.ConversionPattern=%d{ISO8601} - %-5p - [%t:%C{
 
 # Max log file size of 10MB
 log4j.appender.ROLLINGFILE.MaxFileSize=10MB
-# uncomment the next line to limit number of backup files
-#log4j.appender.ROLLINGFILE.MaxBackupIndex=10
 
 log4j.appender.ROLLINGFILE.layout=org.apache.log4j.PatternLayout
 log4j.appender.ROLLINGFILE.layout.ConversionPattern=%d{ISO8601} - %-5p 
[%t:%C{1}@%L] - %m%n



hadoop git commit: HDFS-7890. Improve information on Top users for metrics in RollingWindowsManager and lower log level (Contributed by J.Andreina)

2015-03-29 Thread vinayakumarb
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 7aded71f3 - 9f49b3e93


HDFS-7890. Improve information on Top users for metrics in 
RollingWindowsManager and lower log level (Contributed by J.Andreina)

(cherry picked from commit 1ed9fb76645ecd195afe0067497dca10a3fb997d)


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

Branch: refs/heads/branch-2
Commit: 9f49b3e93d2d50c474a66a5dc8d6bcba1804ed1a
Parents: 7aded71
Author: Vinayakumar B vinayakum...@apache.org
Authored: Mon Mar 30 10:02:48 2015 +0530
Committer: Vinayakumar B vinayakum...@apache.org
Committed: Mon Mar 30 10:04:11 2015 +0530

--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt   | 3 +++
 .../hdfs/server/namenode/top/window/RollingWindowManager.java | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/9f49b3e9/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 4e93a1d..151f71b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -38,6 +38,9 @@ Release 2.8.0 - UNRELEASED
 HDFS-6408. Remove redundant definitions in log4j.properties.
 (Abhiraj Butala via aajisaka)
 
+HDFS-7890. Improve information on Top users for metrics in
+RollingWindowsManager and lower log level (J.Andreina via vinayakumarb)
+
   OPTIMIZATIONS
 
   BUG FIXES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/9f49b3e9/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/top/window/RollingWindowManager.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/top/window/RollingWindowManager.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/top/window/RollingWindowManager.java
index 00e7087..4759cc8 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/top/window/RollingWindowManager.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/top/window/RollingWindowManager.java
@@ -245,7 +245,7 @@ public class RollingWindowManager {
   metricName, userName, windowSum);
   topN.offer(new NameValuePair(userName, windowSum));
 }
-LOG.info(topN size for command {} is: {}, metricName, topN.size());
+LOG.debug(topN users size for command {} is: {}, metricName, 
topN.size());
 return topN;
   }
 



hadoop git commit: Minor, fixed the ec schema file property key

2015-03-29 Thread drankye
Repository: hadoop
Updated Branches:
  refs/heads/HDFS-7285 45bf18e2a - 27cb5701e


Minor, fixed the ec schema file property key


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

Branch: refs/heads/HDFS-7285
Commit: 27cb5701ee5d418a66d17ec68b7c8ab52d4a2c70
Parents: 45bf18e
Author: Kai Zheng kai.zh...@intel.com
Authored: Mon Mar 30 07:21:05 2015 +0800
Committer: Drankye dran...@gmail.com
Committed: Mon Mar 30 07:21:05 2015 +0800

--
 .../main/java/org/apache/hadoop/fs/CommonConfigurationKeys.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/27cb5701/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeys.java
--
diff --git 
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeys.java
 
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeys.java
index cbf0e61..af32674 100644
--- 
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeys.java
+++ 
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeys.java
@@ -142,7 +142,7 @@ public class CommonConfigurationKeys extends 
CommonConfigurationKeysPublic {
   public static final String IO_ERASURECODE_CODECS_KEY = 
io.erasurecode.codecs;
 
   public static final String IO_ERASURECODE_SCHEMA_FILE_KEY =
-  hadoop.io.erasurecode.;
+  io.erasurecode.schema.file;
   public static final String IO_ERASURECODE_SCHEMA_FILE_DEFAULT =
   ecschema-def.xml;