From c218e576fe54df208e277365f1ac24f993f2a4b1 Mon Sep 17 00:00:00 2001
From: Duo Zhang <zhangduo@apache.org>
Date: Tue, 12 Jan 2021 16:08:54 +0800
Subject: [PATCH] Revert "HBASE-25449 'dfs.client.read.shortcircuit' should not
 be set in hbase-default.xml"

This reverts commit 49aba571813f649a2ff4482a2209ee9910cc72c3.
---
 .../src/main/resources/hbase-default.xml      |  4 +-
 .../hadoop/hbase/TestHBaseConfiguration.java  | 17 --------
 .../src/test/resources/hdfs-default.xml       | 42 -------------------
 .../src/test/resources/hdfs-scr-enabled.xml   | 42 -------------------
 4 files changed, 2 insertions(+), 103 deletions(-)
 delete mode 100644 hbase-common/src/test/resources/hdfs-default.xml
 delete mode 100644 hbase-common/src/test/resources/hdfs-scr-enabled.xml

diff --git a/hbase-common/src/main/resources/hbase-default.xml b/hbase-common/src/main/resources/hbase-default.xml
index 20f3881edb2c..9092dd147198 100644
--- a/hbase-common/src/main/resources/hbase-default.xml
+++ b/hbase-common/src/main/resources/hbase-default.xml
@@ -1461,7 +1461,7 @@ possible configurations would overwhelm and obscure the important.
   </property>
   <property>
     <name>dfs.client.read.shortcircuit</name>
-    <value></value>
+    <value>false</value>
     <description>
       If set to true, this configuration parameter enables short-circuit local
       reads.
@@ -1469,7 +1469,7 @@ possible configurations would overwhelm and obscure the important.
   </property>
   <property>
     <name>dfs.domain.socket.path</name>
-    <value></value>
+    <value>none</value>
     <description>
       This is a path to a UNIX domain socket that will be used for
       communication between the DataNode and local HDFS clients, if
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/TestHBaseConfiguration.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/TestHBaseConfiguration.java
index 1144f1daf351..6a0b4283ed03 100644
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/TestHBaseConfiguration.java
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/TestHBaseConfiguration.java
@@ -115,23 +115,6 @@ public void testSecurityConfCaseInsensitive() {
     conf.set("hbase.security.authentication", "KERBeros");
     Assert.assertTrue(User.isHBaseSecurityEnabled(conf));
   }
-  
-  @Test
-  public void testGetConfigOfShortcircuitRead() throws Exception {
-    Configuration conf = HBaseConfiguration.create();
-    Configuration.addDefaultResource("hdfs-default.xml");
-    assertEquals("hdfs-default.xml",
-            conf.getPropertySources("dfs.client.read.shortcircuit")[0]);
-    assertEquals("false", conf.get("dfs.client.read.shortcircuit"));
-    assertNull(conf.get("dfs.domain.socket.path"));
-    Configuration.addDefaultResource("hdfs-scr-enabled.xml");
-    assertEquals("hdfs-scr-enabled.xml",
-            conf.getPropertySources("dfs.client.read.shortcircuit")[0]);
-    assertEquals("hdfs-scr-enabled.xml",
-            conf.getPropertySources("dfs.domain.socket.path")[0]);
-    assertEquals("true", conf.get("dfs.client.read.shortcircuit"));
-    assertEquals("/var/lib/hadoop-hdfs/dn_socket", conf.get("dfs.domain.socket.path"));
-  }
 
   private static class ReflectiveCredentialProviderClient {
     public static final String HADOOP_CRED_PROVIDER_FACTORY_CLASS_NAME =
diff --git a/hbase-common/src/test/resources/hdfs-default.xml b/hbase-common/src/test/resources/hdfs-default.xml
deleted file mode 100644
index fdb3c36edc87..000000000000
--- a/hbase-common/src/test/resources/hdfs-default.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration>
-  <property>
-    <name>dfs.client.read.shortcircuit</name>
-    <value>false</value>
-    <description>
-      If set to true, this configuration parameter enables short-circuit local
-      reads.
-    </description>
-  </property>
-  <property>
-    <name>dfs.domain.socket.path</name>
-    <value></value>
-    <description>
-    Optional.  This is a path to a UNIX domain socket that will be used for
-      communication between the DataNode and local HDFS clients.
-      If the string "_PORT" is present in this path, it will be replaced by the
-      TCP port of the DataNode.
-    </description>
-  </property>
-</configuration>
diff --git a/hbase-common/src/test/resources/hdfs-scr-enabled.xml b/hbase-common/src/test/resources/hdfs-scr-enabled.xml
deleted file mode 100644
index 8594494782c5..000000000000
--- a/hbase-common/src/test/resources/hdfs-scr-enabled.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!--
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-
-<configuration>
-  <property>
-    <name>dfs.client.read.shortcircuit</name>
-    <value>true</value>
-    <description>
-      If set to true, this configuration parameter enables short-circuit local
-      reads.
-    </description>
-  </property>
-  <property>
-    <name>dfs.domain.socket.path</name>
-    <value>/var/lib/hadoop-hdfs/dn_socket</value>
-    <description>
-    Optional.  This is a path to a UNIX domain socket that will be used for
-      communication between the DataNode and local HDFS clients.
-      If the string "_PORT" is present in this path, it will be replaced by the
-      TCP port of the DataNode.
-    </description>
-  </property>
-</configuration>