Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "HBASE-25449 'dfs.client.read.shortcircuit' should not be set in hbase-default.xml" 

This reverts commit 09db88d3ba.
This commit is contained in:
Duo Zhang 2021-01-12 16:10:41 +08:00
parent aa27488268
commit 43ee12640b
4 changed files with 2 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hbase-common/src/main/resources/hbase-default.xml
View File

@ -1442,7 +1442,7 @@ possible configurations would overwhelm and obscure the important.
</property> </property>
<property> <property>
<name>dfs.client.read.shortcircuit</name> <name>dfs.client.read.shortcircuit</name>
<value></value> <value>false</value>
<description> <description>
If set to true, this configuration parameter enables short-circuit local If set to true, this configuration parameter enables short-circuit local
reads. reads.
@ -1450,7 +1450,7 @@ possible configurations would overwhelm and obscure the important.
</property> </property>
<property> <property>
<name>dfs.domain.socket.path</name> <name>dfs.domain.socket.path</name>
<value></value> <value>none</value>
<description> <description>
This is a path to a UNIX domain socket that will be used for This is a path to a UNIX domain socket that will be used for
communication between the DataNode and local HDFS clients, if communication between the DataNode and local HDFS clients, if

17
hbase-common/src/test/java/org/apache/hadoop/hbase/TestHBaseConfiguration.java
View File

@ -115,23 +115,6 @@ public class TestHBaseConfiguration {
conf.set("hbase.security.authentication", "KERBeros"); conf.set("hbase.security.authentication", "KERBeros");
Assert.assertTrue(User.isHBaseSecurityEnabled(conf)); 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 { private static class ReflectiveCredentialProviderClient {
public static final String HADOOP_CRED_PROVIDER_FACTORY_CLASS_NAME = public static final String HADOOP_CRED_PROVIDER_FACTORY_CLASS_NAME =

42
hbase-common/src/test/resources/hdfs-default.xml
View File

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

42
hbase-common/src/test/resources/hdfs-scr-enabled.xml
View File

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