HDFS-8349. Remove .xml and documentation references to dfs.webhdfs.en…

…abled. Contributed by Ray Chiang.
apache · May 8, 2015 · c5afe44 · c5afe44
1 parent e16f4b7
commit c5afe44
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 13 deletions.
diff --git 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
 

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
@@ -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

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
@@ -1496,14 +1496,6 @@
   </description>
 </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>

diff --git 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. |
 

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
@@ -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",