[23/50] [abbrv] hadoop git commit: HDFS-7985. WebHDFS should be always enabled. Contributed by Li Lu.

2015-03-27 Thread zjshen 
HDFS-7985. WebHDFS should be always enabled. Contributed by Li Lu.


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

Branch: refs/heads/YARN-2928
Commit: e6bcb7eafd53882c6e4053aa49e8ba8460464e19
Parents: 6ec1a4a
Author: Haohui Mai whe...@apache.org
Authored: Tue Mar 24 21:55:56 2015 -0700
Committer: Zhijie Shen zjs...@apache.org
Committed: Thu Mar 26 23:29:46 2015 -0700

--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt |  2 +
 .../org/apache/hadoop/hdfs/DFSConfigKeys.java   |  2 -
 .../server/namenode/NameNodeHttpServer.java | 46 ++--
 .../hadoop/hdfs/web/WebHdfsFileSystem.java  |  7 ---
 .../src/main/native/libhdfs/native_mini_dfs.c   | 16 ---
 .../org/apache/hadoop/fs/TestSymlinkHdfs.java   |  1 -
 .../hadoop/hdfs/TestDistributedFileSystem.java  |  1 -
 .../java/org/apache/hadoop/hdfs/TestQuota.java  |  4 +-
 .../hdfs/security/TestDelegationToken.java  |  1 -
 .../TestDelegationTokenForProxyUser.java|  1 -
 .../hdfs/server/namenode/TestAuditLogs.java |  1 -
 .../TestNameNodeRespectsBindHostKeys.java   |  1 -
 .../hdfs/web/TestFSMainOperationsWebHdfs.java   |  1 -
 .../hadoop/hdfs/web/TestHttpsFileSystem.java|  1 -
 .../org/apache/hadoop/hdfs/web/TestWebHDFS.java | 12 -
 .../hdfs/web/TestWebHdfsFileSystemContract.java |  1 -
 .../hadoop/hdfs/web/TestWebHdfsTokens.java  |  1 -
 .../web/TestWebHdfsWithMultipleNameNodes.java   |  2 -
 .../apache/hadoop/hdfs/web/WebHdfsTestUtil.java |  1 -
 19 files changed, 25 insertions(+), 77 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/e6bcb7ea/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 4bed2ab..8d7a4e1 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -18,6 +18,8 @@ Trunk (Unreleased)
 option since it may incorrectly finalize an ongoing rolling upgrade.
 (Kai Sasaki via szetszwo)
 
+HDFS-7985. WebHDFS should be always enabled. (Li Lu via wheat9)
+
   NEW FEATURES
 
 HDFS-3125. Add JournalService to enable Journal Daemon. (suresh)

http://git-wip-us.apache.org/repos/asf/hadoop/blob/e6bcb7ea/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
index b5bbe5f..d714276 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
@@ -227,8 +227,6 @@ public class DFSConfigKeys extends CommonConfigurationKeys {
   public static final int 
DFS_NAMENODE_REPLICATION_STREAMS_HARD_LIMIT_DEFAULT = 4;
   public static final String  DFS_WEBHDFS_AUTHENTICATION_FILTER_KEY = 
dfs.web.authentication.filter;
   public static final String  DFS_WEBHDFS_AUTHENTICATION_FILTER_DEFAULT = 
AuthFilter.class.getName();
-  public static final String  DFS_WEBHDFS_ENABLED_KEY = dfs.webhdfs.enabled;
-  public static final boolean DFS_WEBHDFS_ENABLED_DEFAULT = true;
   public static final String  DFS_WEBHDFS_USER_PATTERN_KEY = 
dfs.webhdfs.user.provider.user.pattern;
   public static final String  DFS_WEBHDFS_USER_PATTERN_DEFAULT = 
^[A-Za-z_][A-Za-z0-9._-]*[$]?$;
   public static final String  DFS_PERMISSIONS_ENABLED_KEY = 
dfs.permissions.enabled;

http://git-wip-us.apache.org/repos/asf/hadoop/blob/e6bcb7ea/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeHttpServer.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeHttpServer.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeHttpServer.java
index 662c0e9..a671d21 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeHttpServer.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeHttpServer.java
@@ -67,30 +67,28 @@ public class NameNodeHttpServer {
   }
 
   private void initWebHdfs(Configuration conf) throws IOException {
-if (WebHdfsFileSystem.isEnabled(conf, HttpServer2.LOG)) {
-  // set user pattern

[44/51] [abbrv] hadoop git commit: HDFS-7985. WebHDFS should be always enabled. Contributed by Li Lu.

2015-03-25 Thread kasha 
HDFS-7985. WebHDFS should be always enabled. Contributed by Li Lu.


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

Branch: refs/heads/YARN-2139
Commit: 80278a5f85a91b3e02e700e0b3c0a433c15e0565
Parents: 53a28af
Author: Haohui Mai whe...@apache.org
Authored: Tue Mar 24 21:55:56 2015 -0700
Committer: Haohui Mai whe...@apache.org
Committed: Tue Mar 24 21:55:56 2015 -0700

--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt |  2 +
 .../org/apache/hadoop/hdfs/DFSConfigKeys.java   |  2 -
 .../server/namenode/NameNodeHttpServer.java | 46 ++--
 .../hadoop/hdfs/web/WebHdfsFileSystem.java  |  7 ---
 .../src/main/native/libhdfs/native_mini_dfs.c   | 16 ---
 .../org/apache/hadoop/fs/TestSymlinkHdfs.java   |  1 -
 .../hadoop/hdfs/TestDistributedFileSystem.java  |  1 -
 .../java/org/apache/hadoop/hdfs/TestQuota.java  |  4 +-
 .../hdfs/security/TestDelegationToken.java  |  1 -
 .../TestDelegationTokenForProxyUser.java|  1 -
 .../hdfs/server/namenode/TestAuditLogs.java |  1 -
 .../TestNameNodeRespectsBindHostKeys.java   |  1 -
 .../hdfs/web/TestFSMainOperationsWebHdfs.java   |  1 -
 .../hadoop/hdfs/web/TestHttpsFileSystem.java|  1 -
 .../org/apache/hadoop/hdfs/web/TestWebHDFS.java | 12 -
 .../hdfs/web/TestWebHdfsFileSystemContract.java |  1 -
 .../hadoop/hdfs/web/TestWebHdfsTokens.java  |  1 -
 .../web/TestWebHdfsWithMultipleNameNodes.java   |  2 -
 .../apache/hadoop/hdfs/web/WebHdfsTestUtil.java |  1 -
 19 files changed, 25 insertions(+), 77 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/80278a5f/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 4bed2ab..8d7a4e1 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -18,6 +18,8 @@ Trunk (Unreleased)
 option since it may incorrectly finalize an ongoing rolling upgrade.
 (Kai Sasaki via szetszwo)
 
+HDFS-7985. WebHDFS should be always enabled. (Li Lu via wheat9)
+
   NEW FEATURES
 
 HDFS-3125. Add JournalService to enable Journal Daemon. (suresh)

http://git-wip-us.apache.org/repos/asf/hadoop/blob/80278a5f/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
index b5bbe5f..d714276 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
@@ -227,8 +227,6 @@ public class DFSConfigKeys extends CommonConfigurationKeys {
   public static final int 
DFS_NAMENODE_REPLICATION_STREAMS_HARD_LIMIT_DEFAULT = 4;
   public static final String  DFS_WEBHDFS_AUTHENTICATION_FILTER_KEY = 
dfs.web.authentication.filter;
   public static final String  DFS_WEBHDFS_AUTHENTICATION_FILTER_DEFAULT = 
AuthFilter.class.getName();
-  public static final String  DFS_WEBHDFS_ENABLED_KEY = dfs.webhdfs.enabled;
-  public static final boolean DFS_WEBHDFS_ENABLED_DEFAULT = true;
   public static final String  DFS_WEBHDFS_USER_PATTERN_KEY = 
dfs.webhdfs.user.provider.user.pattern;
   public static final String  DFS_WEBHDFS_USER_PATTERN_DEFAULT = 
^[A-Za-z_][A-Za-z0-9._-]*[$]?$;
   public static final String  DFS_PERMISSIONS_ENABLED_KEY = 
dfs.permissions.enabled;

http://git-wip-us.apache.org/repos/asf/hadoop/blob/80278a5f/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeHttpServer.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeHttpServer.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeHttpServer.java
index 662c0e9..a671d21 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeHttpServer.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeHttpServer.java
@@ -67,30 +67,28 @@ public class NameNodeHttpServer {
   }
 
   private void initWebHdfs(Configuration conf) throws IOException {
-if (WebHdfsFileSystem.isEnabled(conf, HttpServer2.LOG)) {
-  // set user pattern

hadoop git commit: HDFS-7985. WebHDFS should be always enabled. Contributed by Li Lu.

2015-03-24 Thread wheat9 
Repository: hadoop
Updated Branches:
  refs/heads/trunk 53a28afe2 - 80278a5f8


HDFS-7985. WebHDFS should be always enabled. Contributed by Li Lu.


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

Branch: refs/heads/trunk
Commit: 80278a5f85a91b3e02e700e0b3c0a433c15e0565
Parents: 53a28af
Author: Haohui Mai whe...@apache.org
Authored: Tue Mar 24 21:55:56 2015 -0700
Committer: Haohui Mai whe...@apache.org
Committed: Tue Mar 24 21:55:56 2015 -0700

--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt |  2 +
 .../org/apache/hadoop/hdfs/DFSConfigKeys.java   |  2 -
 .../server/namenode/NameNodeHttpServer.java | 46 ++--
 .../hadoop/hdfs/web/WebHdfsFileSystem.java  |  7 ---
 .../src/main/native/libhdfs/native_mini_dfs.c   | 16 ---
 .../org/apache/hadoop/fs/TestSymlinkHdfs.java   |  1 -
 .../hadoop/hdfs/TestDistributedFileSystem.java  |  1 -
 .../java/org/apache/hadoop/hdfs/TestQuota.java  |  4 +-
 .../hdfs/security/TestDelegationToken.java  |  1 -
 .../TestDelegationTokenForProxyUser.java|  1 -
 .../hdfs/server/namenode/TestAuditLogs.java |  1 -
 .../TestNameNodeRespectsBindHostKeys.java   |  1 -
 .../hdfs/web/TestFSMainOperationsWebHdfs.java   |  1 -
 .../hadoop/hdfs/web/TestHttpsFileSystem.java|  1 -
 .../org/apache/hadoop/hdfs/web/TestWebHDFS.java | 12 -
 .../hdfs/web/TestWebHdfsFileSystemContract.java |  1 -
 .../hadoop/hdfs/web/TestWebHdfsTokens.java  |  1 -
 .../web/TestWebHdfsWithMultipleNameNodes.java   |  2 -
 .../apache/hadoop/hdfs/web/WebHdfsTestUtil.java |  1 -
 19 files changed, 25 insertions(+), 77 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/80278a5f/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 4bed2ab..8d7a4e1 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -18,6 +18,8 @@ Trunk (Unreleased)
 option since it may incorrectly finalize an ongoing rolling upgrade.
 (Kai Sasaki via szetszwo)
 
+HDFS-7985. WebHDFS should be always enabled. (Li Lu via wheat9)
+
   NEW FEATURES
 
 HDFS-3125. Add JournalService to enable Journal Daemon. (suresh)

http://git-wip-us.apache.org/repos/asf/hadoop/blob/80278a5f/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
index b5bbe5f..d714276 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
@@ -227,8 +227,6 @@ public class DFSConfigKeys extends CommonConfigurationKeys {
   public static final int 
DFS_NAMENODE_REPLICATION_STREAMS_HARD_LIMIT_DEFAULT = 4;
   public static final String  DFS_WEBHDFS_AUTHENTICATION_FILTER_KEY = 
dfs.web.authentication.filter;
   public static final String  DFS_WEBHDFS_AUTHENTICATION_FILTER_DEFAULT = 
AuthFilter.class.getName();
-  public static final String  DFS_WEBHDFS_ENABLED_KEY = dfs.webhdfs.enabled;
-  public static final boolean DFS_WEBHDFS_ENABLED_DEFAULT = true;
   public static final String  DFS_WEBHDFS_USER_PATTERN_KEY = 
dfs.webhdfs.user.provider.user.pattern;
   public static final String  DFS_WEBHDFS_USER_PATTERN_DEFAULT = 
^[A-Za-z_][A-Za-z0-9._-]*[$]?$;
   public static final String  DFS_PERMISSIONS_ENABLED_KEY = 
dfs.permissions.enabled;

http://git-wip-us.apache.org/repos/asf/hadoop/blob/80278a5f/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeHttpServer.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeHttpServer.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeHttpServer.java
index 662c0e9..a671d21 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeHttpServer.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeHttpServer.java
@@ -67,30 +67,28 @@ public class NameNodeHttpServer {
   }
 
   private void initWebHdfs(Configuration conf) throws IOException {
-if