Skip to content

Commit 9e7c7ad

Browse files
authored
HADOOP-17760. Delete hadoop.ssl.enabled and dfs.https.enable from docs and core-default.xml (#3099)
Reviewed-by: Ayush Saxena <ayushsaxena@apache.org>
1 parent 6562391 commit 9e7c7ad

File tree

4 files changed

+1
-14
lines changed

4 files changed

+1
-14
lines changed

hadoop-common-project/hadoop-common/src/main/resources/core-default.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3096,14 +3096,6 @@
30963096
</description>
30973097
</property>
30983098

3099-
<property>
3100-
<name>hadoop.ssl.enabled</name>
3101-
<value>false</value>
3102-
<description>
3103-
Deprecated. Use dfs.http.policy and yarn.http.policy instead.
3104-
</description>
3105-
</property>
3106-
31073099
<property>
31083100
<name>hadoop.ssl.enabled.protocols</name>
31093101
<value>TLSv1.2</value>

hadoop-common-project/hadoop-common/src/site/markdown/SecureMode.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,9 +269,8 @@ The following settings allow configuring SSL access to the NameNode web UI (opti
269269

270270
| Parameter | Value | Notes |
271271
|:-----------------------------|:------------------------------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
272-
| `dfs.http.policy` | `HTTP_ONLY` or `HTTPS_ONLY` or `HTTP_AND_HTTPS` | `HTTPS_ONLY` turns off http access. This option takes precedence over the deprecated configuration dfs.https.enable and hadoop.ssl.enabled. If using SASL to authenticate data transfer protocol instead of running DataNode as root and using privileged ports, then this property must be set to `HTTPS_ONLY` to guarantee authentication of HTTP servers. (See `dfs.data.transfer.protection`.) |
272+
| `dfs.http.policy` | `HTTP_ONLY` or `HTTPS_ONLY` or `HTTP_AND_HTTPS` | `HTTPS_ONLY` turns off http access. If using SASL to authenticate data transfer protocol instead of running DataNode as root and using privileged ports, then this property must be set to `HTTPS_ONLY` to guarantee authentication of HTTP servers. (See `dfs.data.transfer.protection`.) |
273273
| `dfs.namenode.https-address` | `0.0.0.0:9871` | This parameter is used in non-HA mode and without federation. See [HDFS High Availability](../hadoop-hdfs/HDFSHighAvailabilityWithNFS.html#Deployment) and [HDFS Federation](../hadoop-hdfs/Federation.html#Federation_Configuration) for details. |
274-
| `dfs.https.enable` | `true` | This value is deprecated. `Use dfs.http.policy` |
275274

276275
### Secondary NameNode
277276

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestCommonConfigurationFields.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,6 @@ public void initializeMemberVariables() {
238238
// - org.apache.hadoop.net.NetUtils
239239
xmlPropsToSkipCompare
240240
.add("hadoop.rpc.socket.factory.class.ClientProtocol");
241-
// - Where is this used?
242-
xmlPropsToSkipCompare.add("hadoop.ssl.enabled");
243241

244242
// Keys with no corresponding variable
245243
// - org.apache.hadoop.io.compress.bzip2.Bzip2Factory

hadoop-tools/hadoop-sls/src/main/data/2jobs2min-rumen-jh.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4559,7 +4559,6 @@
45594559
"hadoop.hdfs.configuration.version" : "1",
45604560
"dfs.datanode.balance.bandwidthPerSec" : "1048576",
45614561
"mapreduce.reduce.shuffle.connect.timeout" : "180000",
4562-
"hadoop.ssl.enabled" : "false",
45634562
"dfs.journalnode.rpc-address" : "0.0.0.0:8485",
45644563
"yarn.nodemanager.aux-services" : "mapreduce.shuffle",
45654564
"mapreduce.job.counters.max" : "120",
@@ -9626,7 +9625,6 @@
96269625
"hadoop.hdfs.configuration.version" : "1",
96279626
"dfs.datanode.balance.bandwidthPerSec" : "1048576",
96289627
"mapreduce.reduce.shuffle.connect.timeout" : "180000",
9629-
"hadoop.ssl.enabled" : "false",
96309628
"dfs.journalnode.rpc-address" : "0.0.0.0:8485",
96319629
"yarn.nodemanager.aux-services" : "mapreduce.shuffle",
96329630
"mapreduce.job.counters.max" : "120",

0 commit comments

Comments
 (0)