From 975b6024dd9c7b6e5d0abd3e3f201afd9ae84235 Mon Sep 17 00:00:00 2001 From: Ayush Saxena Date: Fri, 7 Aug 2020 22:19:17 +0530 Subject: [PATCH] HDFS-15514. Remove useless dfs.webhdfs.enabled. Contributed by Fei Hui. --- .../java/org/apache/hadoop/tools/TestHdfsConfigFields.java | 3 --- .../org/apache/hadoop/fs/s3a/commit/MiniDFSClusterService.java | 1 - 2 files changed, 4 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestHdfsConfigFields.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestHdfsConfigFields.java index 9fd505fd4a..63c6233d23 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestHdfsConfigFields.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestHdfsConfigFields.java @@ -121,9 +121,6 @@ public void initializeMemberVariables() { // Used oddly by DataNode to create new config String xmlPropsToSkipCompare.add("hadoop.hdfs.configuration.version"); - // Skip comparing in branch-2. Removed in trunk with HDFS-7985. - xmlPropsToSkipCompare.add("dfs.webhdfs.enabled"); - // Some properties have moved to HdfsClientConfigKeys xmlPropsToSkipCompare.add("dfs.client.short.circuit.replica.stale.threshold.ms"); diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/commit/MiniDFSClusterService.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/commit/MiniDFSClusterService.java index 7f689e0d3d..6e6ecd1a46 100644 --- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/commit/MiniDFSClusterService.java +++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/commit/MiniDFSClusterService.java @@ -39,7 +39,6 @@ public MiniDFSClusterService() { @Override protected void serviceInit(Configuration conf) throws Exception { - conf.setBoolean("dfs.webhdfs.enabled", false); super.serviceInit(conf); }