Revert "HBASE-25449 'dfs.client.read.shortcircuit' should not be set …

…in hbase-default.xml"

This reverts commit 49aba57.

hbase-common/src/main/resources/hbase-default.xml

@@ -1461,15 +1461,15 @@ 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.
     </description>
   </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

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 =