This is an automated email from the ASF dual-hosted git repository.
snemeth pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 9342ecf6ccd HADOOP-18870. CURATOR-599 change broke functionality
introduced in HADOOP-18139 and HADOOP-18709. Contributed by Ferenc Erdelyi
9342ecf6ccd is described below
commit 9342ecf6ccd5c7ef443a0eb722852d2addc1d5db
Author: Szilard Nemeth <snem...@apache.org>
AuthorDate: Wed Sep 6 21:32:36 2023 -0400
HADOOP-18870. CURATOR-599 change broke functionality introduced in
HADOOP-18139 and HADOOP-18709. Contributed by Ferenc Erdelyi
---
.../hadoop/util/curator/ZKCuratorManager.java | 12 +++++++-
.../hadoop/util/curator/TestZKCuratorManager.java | 35 ++++++++++++++++++++++
2 files changed, 46 insertions(+), 1 deletion(-)
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/curator/ZKCuratorManager.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/curator/ZKCuratorManager.java
index 81ee4663e1c..4df79774329 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/curator/ZKCuratorManager.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/curator/ZKCuratorManager.java
@@ -549,7 +549,17 @@ public final class ZKCuratorManager {
public ZooKeeper newZooKeeper(String connectString, int sessionTimeout,
Watcher watcher, boolean canBeReadOnly
) throws Exception {
- ZKClientConfig zkClientConfig = new ZKClientConfig();
+ return this.newZooKeeper(connectString, sessionTimeout,
+ watcher, canBeReadOnly, new ZKClientConfig());
+ }
+
+ @Override
+ public ZooKeeper newZooKeeper(String connectString, int sessionTimeout,
+ Watcher watcher, boolean canBeReadOnly, ZKClientConfig zkClientConfig
+ ) throws Exception {
+ if (zkClientConfig == null) {
+ zkClientConfig = new ZKClientConfig();
+ }
if (zkPrincipal != null) {
LOG.info("Configuring zookeeper to use {} as the server principal",
zkPrincipal);
diff --git
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/curator/TestZKCuratorManager.java
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/curator/TestZKCuratorManager.java
index fd15a0c2b1b..4365e43e491 100644
---
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/curator/TestZKCuratorManager.java
+++
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/curator/TestZKCuratorManager.java
@@ -22,10 +22,15 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import javax.security.auth.login.AppConfigurationEntry;
+
+import org.apache.curator.framework.CuratorFramework;
+import org.apache.curator.framework.CuratorFrameworkFactory;
+import org.apache.curator.retry.RetryNTimes;
import org.apache.curator.test.TestingServer;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.CommonConfigurationKeys;
@@ -193,6 +198,36 @@ public class TestZKCuratorManager {
}
}
+ @Test
+ public void testCuratorFrameworkFactory() throws Exception{
+ // By not explicitly calling the NewZooKeeper method validate that the
Curator override works.
+ ZKClientConfig zkClientConfig = new ZKClientConfig();
+ Configuration conf = new Configuration();
+ conf.set(CommonConfigurationKeys.ZK_ADDRESS,
this.server.getConnectString());
+ int numRetries = conf.getInt(CommonConfigurationKeys.ZK_NUM_RETRIES,
+ CommonConfigurationKeys.ZK_NUM_RETRIES_DEFAULT);
+ int zkSessionTimeout = conf.getInt(CommonConfigurationKeys.ZK_TIMEOUT_MS,
+ CommonConfigurationKeys.ZK_TIMEOUT_MS_DEFAULT);
+ int zkRetryInterval = conf.getInt(
+ CommonConfigurationKeys.ZK_RETRY_INTERVAL_MS,
+ CommonConfigurationKeys.ZK_RETRY_INTERVAL_MS_DEFAULT);
+ RetryNTimes retryPolicy = new RetryNTimes(numRetries, zkRetryInterval);
+
+ CuratorFramework client = CuratorFrameworkFactory.builder()
+ .connectString(conf.get(CommonConfigurationKeys.ZK_ADDRESS))
+ .zkClientConfig(zkClientConfig)
+ .sessionTimeoutMs(zkSessionTimeout).retryPolicy(retryPolicy)
+ .authorization(new ArrayList<>())
+ .zookeeperFactory(new ZKCuratorManager.HadoopZookeeperFactory(
+ "foo1", "bar1", "bar1.keytab", false,
+ new ZKCuratorManager.TruststoreKeystore(conf))
+
+ ).build();
+ client.start();
+
validateJaasConfiguration(ZKCuratorManager.HadoopZookeeperFactory.JAAS_CLIENT_ENTRY,
+ "bar1", "bar1.keytab", client.getZookeeperClient().getZooKeeper());
+ }
+
private void validateJaasConfiguration(String clientConfig, String
principal, String keytab,
ZooKeeper zk) {
assertEquals("Validate that expected clientConfig is set in ZK config",
clientConfig,
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
