You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by aa...@apache.org on 2015/05/08 08:58:40 UTC
hadoop git commit: HDFS-8349. Remove .xml and documentation
references to dfs.webhdfs.enabled. Contributed by Ray Chiang.
Repository: hadoop
Updated Branches:
refs/heads/trunk e16f4b7f7 -> c5afe444d
HDFS-8349. Remove .xml and documentation references to dfs.webhdfs.enabled. Contributed by Ray Chiang.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c5afe444
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c5afe444
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c5afe444
Branch: refs/heads/trunk
Commit: c5afe444dfd45237e3b986ca3054d068e92c64e8
Parents: e16f4b7
Author: Akira Ajisaka <aa...@apache.org>
Authored: Fri May 8 15:56:22 2015 +0900
Committer: Akira Ajisaka <aa...@apache.org>
Committed: Fri May 8 15:57:13 2015 +0900
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../hadoop-hdfs/src/main/native/libhdfs/native_mini_dfs.c | 2 --
.../hadoop-hdfs/src/main/resources/hdfs-default.xml | 8 --------
hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/WebHDFS.md | 1 -
.../hadoop-sls/src/main/data/2jobs2min-rumen-jh.json | 2 --
5 files changed, 3 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c5afe444/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 656e005..6032692 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -22,6 +22,9 @@ Trunk (Unreleased)
HDFS-7281. Missing block is marked as corrupted block (Ming Ma via
Yongjun Zhang)
+
+ HDFS-8349. Remove .xml and documentation references to dfs.webhdfs.enabled.
+ (Ray Chiang via aajisaka)
NEW FEATURES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c5afe444/hadoop-hdfs-project/hadoop-hdfs/src/main/native/libhdfs/native_mini_dfs.c
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/native/libhdfs/native_mini_dfs.c b/hadoop-hdfs-project/hadoop-hdfs/src/main/native/libhdfs/native_mini_dfs.c
index ab6abda..b36ef76 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/native/libhdfs/native_mini_dfs.c
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/native/libhdfs/native_mini_dfs.c
@@ -40,8 +40,6 @@
#define HADOOP_NAMENODE "org/apache/hadoop/hdfs/server/namenode/NameNode"
#define JAVA_INETSOCKETADDRESS "java/net/InetSocketAddress"
-#define DFS_WEBHDFS_ENABLED_KEY "dfs.webhdfs.enabled"
-
struct NativeMiniDfsCluster {
/**
* The NativeMiniDfsCluster object
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c5afe444/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml
index e3e4323..9e7061a 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml
@@ -1497,14 +1497,6 @@
</property>
<property>
- <name>dfs.webhdfs.enabled</name>
- <value>true</value>
- <description>
- Enable WebHDFS (REST API) in Namenodes and Datanodes.
- </description>
-</property>
-
-<property>
<name>hadoop.fuse.connection.timeout</name>
<value>300</value>
<description>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c5afe444/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/WebHDFS.md
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/WebHDFS.md b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/WebHDFS.md
index e6e41d9..d0231a3 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/WebHDFS.md
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/WebHDFS.md
@@ -194,7 +194,6 @@ Below are the HDFS configuration options for WebHDFS.
| Property Name | Description |
|:---- |:---- |
-| `dfs.webhdfs.enabled ` | Enable/disable WebHDFS in Namenodes and Datanodes |
| `dfs.web.authentication.kerberos.principal` | The HTTP Kerberos principal used by Hadoop-Auth in the HTTP endpoint. The HTTP Kerberos principal MUST start with 'HTTP/' per Kerberos HTTP SPNEGO specification. A value of "\*" will use all HTTP principals found in the keytab. |
| `dfs.web.authentication.kerberos.keytab ` | The Kerberos keytab file with the credentials for the HTTP Kerberos principal used by Hadoop-Auth in the HTTP endpoint. |
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c5afe444/hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json b/hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json
index 4be3e08..83629ed 100644
--- a/hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json
+++ b/hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json
@@ -4921,7 +4921,6 @@
"hadoop.kerberos.kinit.command" : "kinit",
"dfs.datanode.du.reserved" : "0",
"dfs.namenode.fs-limits.max-blocks-per-file" : "1048576",
- "dfs.webhdfs.enabled" : "false",
"file.bytes-per-checksum" : "512",
"mapreduce.task.profile.reduces" : "0-2",
"mapreduce.jobtracker.handler.count" : "10",
@@ -10027,7 +10026,6 @@
"hadoop.kerberos.kinit.command" : "kinit",
"dfs.datanode.du.reserved" : "0",
"dfs.namenode.fs-limits.max-blocks-per-file" : "1048576",
- "dfs.webhdfs.enabled" : "false",
"file.bytes-per-checksum" : "512",
"mapreduce.task.profile.reduces" : "0-2",
"mapreduce.jobtracker.handler.count" : "10",