This is an automated email from the ASF dual-hosted git repository.
meszibalu pushed a commit to branch branch-2.5
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.5 by this push:
new 445e1443fc1 HBASE-28340. Use all Zk client properties that is found in
HBase conf (#5682)
445e1443fc1 is described below
commit 445e1443fc1451373355249d91bc4924e104710a
Author: Andor Molnár <an...@cloudera.com>
AuthorDate: Thu Feb 15 14:50:53 2024 +0100
HBASE-28340. Use all Zk client properties that is found in HBase conf
(#5682)
Signed-off-by: Balazs Meszaros <meszib...@apache.org>
---
.../apache/hadoop/hbase/zookeeper/ZKConfig.java | 53 +++++++++-------------
.../hadoop/hbase/zookeeper/TestZKConfig.java | 25 +++++++++-
2 files changed, 45 insertions(+), 33 deletions(-)
diff --git
a/hbase-common/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKConfig.java
b/hbase-common/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKConfig.java
index 481ad285036..d70fa0178a5 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKConfig.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKConfig.java
@@ -28,7 +28,6 @@ import org.apache.hadoop.util.StringUtils;
import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hbase.thirdparty.com.google.common.base.Splitter;
-import org.apache.hbase.thirdparty.com.google.common.collect.ImmutableSet;
/**
* Utility methods for reading, and building the ZooKeeper configuration. The
order and priority for
@@ -41,12 +40,6 @@ public final class ZKConfig {
private static final String VARIABLE_START = "${";
private static final String ZOOKEEPER_JAVA_PROPERTY_PREFIX = "zookeeper.";
- /** Supported ZooKeeper client TLS properties */
- static final Set<String> ZOOKEEPER_CLIENT_TLS_PROPERTIES =
- ImmutableSet.of("client.secure", "clientCnxnSocket",
"ssl.keyStore.location",
- "ssl.keyStore.password", "ssl.keyStore.passwordPath",
"ssl.trustStore.location",
- "ssl.trustStore.password", "ssl.trustStore.passwordPath");
-
private ZKConfig() {
}
@@ -61,16 +54,12 @@ public final class ZKConfig {
}
/**
- * Make a Properties object holding ZooKeeper config. Parses the
corresponding config options from
- * the HBase XML configs and generates the appropriate ZooKeeper properties.
- * @param conf Configuration to read from.
- * @return Properties holding mappings representing ZooKeeper config file.
+ * Directly map all the hbase.zookeeper.property.KEY properties. Synchronize
on conf so no loading
+ * of configs while we iterate
*/
- private static Properties makeZKPropsFromHbaseConfig(Configuration conf) {
+ private static Properties extractZKPropsFromHBaseConfig(final Configuration
conf) {
Properties zkProperties = new Properties();
- // Directly map all of the hbase.zookeeper.property.KEY properties.
- // Synchronize on conf so no loading of configs while we iterate
synchronized (conf) {
for (Entry<String, String> entry : conf) {
String key = entry.getKey();
@@ -86,6 +75,18 @@ public final class ZKConfig {
}
}
+ return zkProperties;
+ }
+
+ /**
+ * Make a Properties object holding ZooKeeper config. Parses the
corresponding config options from
+ * the HBase XML configs and generates the appropriate ZooKeeper properties.
+ * @param conf Configuration to read from.
+ * @return Properties holding mappings representing ZooKeeper config file.
+ */
+ private static Properties makeZKPropsFromHbaseConfig(Configuration conf) {
+ Properties zkProperties = extractZKPropsFromHBaseConfig(conf);
+
// If clientPort is not set, assign the default.
if (zkProperties.getProperty(HConstants.CLIENT_PORT_STR) == null) {
zkProperties.put(HConstants.CLIENT_PORT_STR,
HConstants.DEFAULT_ZOOKEEPER_CLIENT_PORT);
@@ -320,24 +321,12 @@ public final class ZKConfig {
}
private static void setZooKeeperClientSystemProperties(String prefix,
Configuration conf) {
- synchronized (conf) {
- for (Entry<String, String> entry : conf) {
- String key = entry.getKey();
- if (!key.startsWith(prefix)) {
- continue;
- }
- String zkKey = key.substring(prefix.length());
- if (!ZOOKEEPER_CLIENT_TLS_PROPERTIES.contains(zkKey)) {
- continue;
- }
- String value = entry.getValue();
- // If the value has variables substitutions, need to do a get.
- if (value.contains(VARIABLE_START)) {
- value = conf.get(key);
- }
- if (System.getProperty(ZOOKEEPER_JAVA_PROPERTY_PREFIX + zkKey) ==
null) {
- System.setProperty(ZOOKEEPER_JAVA_PROPERTY_PREFIX + zkKey, value);
- }
+ Properties zkProperties = extractZKPropsFromHBaseConfig(conf);
+ for (Entry<Object, Object> entry : zkProperties.entrySet()) {
+ String key = entry.getKey().toString().trim();
+ String value = entry.getValue().toString().trim();
+ if (System.getProperty(ZOOKEEPER_JAVA_PROPERTY_PREFIX + key) == null) {
+ System.setProperty(ZOOKEEPER_JAVA_PROPERTY_PREFIX + key, value);
}
}
}
diff --git
a/hbase-common/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKConfig.java
b/hbase-common/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKConfig.java
index 7418afe5d22..63df9043bae 100644
---
a/hbase-common/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKConfig.java
+++
b/hbase-common/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKConfig.java
@@ -17,12 +17,12 @@
*/
package org.apache.hadoop.hbase.zookeeper;
-import static
org.apache.hadoop.hbase.zookeeper.ZKConfig.ZOOKEEPER_CLIENT_TLS_PROPERTIES;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import java.io.IOException;
import java.util.Properties;
+import java.util.Set;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.HBaseConfiguration;
@@ -33,6 +33,8 @@ import org.junit.ClassRule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.apache.hbase.thirdparty.com.google.common.collect.ImmutableSet;
+
@Category({ MiscTests.class, SmallTests.class })
public class TestZKConfig {
@@ -40,6 +42,12 @@ public class TestZKConfig {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestZKConfig.class);
+ /** Supported ZooKeeper client TLS properties */
+ private static final Set<String> ZOOKEEPER_CLIENT_TLS_PROPERTIES =
ImmutableSet.of(
+ "client.secure", "clientCnxnSocket", "ssl.keyStore.location",
"ssl.keyStore.password",
+ "ssl.keyStore.passwordPath", "ssl.keyStore.type",
"ssl.trustStore.location",
+ "ssl.trustStore.password", "ssl.trustStore.passwordPath",
"ssl.trustStore.type");
+
@Test
public void testZKConfigLoading() throws Exception {
Configuration conf = HBaseConfiguration.create();
@@ -133,6 +141,21 @@ public class TestZKConfig {
}
}
+ @Test
+ public void testZooKeeperPropertiesDoesntOverwriteSystem() {
+ // Arrange
+ System.setProperty("zookeeper.a.b.c", "foo");
+ Configuration conf = HBaseConfiguration.create();
+ conf.set(HConstants.ZK_CFG_PROPERTY_PREFIX + "a.b.c", "bar");
+
+ // Act
+ ZKConfig.getZKQuorumServersString(conf);
+
+ // Assert
+ assertEquals("foo", System.getProperty("zookeeper.a.b.c"));
+ System.clearProperty("zookeeper.a.b.c");
+ }
+
private void testKey(String ensemble, int port, String znode) throws
IOException {
testKey(ensemble, port, znode, false); // not support multiple client ports
}
