diff --git a/docs/deployment/settings.md b/docs/deployment/settings.md index ba656a877..5c7c8ae13 100644 --- a/docs/deployment/settings.md +++ b/docs/deployment/settings.md @@ -247,7 +247,7 @@ kyuubi\.ha\.zookeeper
\.connection\.timeout|
NONE
|
The type of zookeeper authentication for engine, all candidates are
|
string
|
1.3.2
kyuubi\.ha\.zookeeper
\.namespace|
kyuubi
|
The root directory for the service to deploy its instance uri
|
string
|
1.0.0
kyuubi\.ha\.zookeeper
\.node\.creation\.timeout|
PT2M
|
Timeout for creating zookeeper node
|
duration
|
1.2.0
-kyuubi\.ha\.zookeeper
\.publish\.configs|
false
|
Whether we should publish Kerberos configs to ZooKeeper.
|
boolean
|
1.4.0
+kyuubi\.ha\.zookeeper
\.publish\.configs|
false
|
When set to true, publish Kerberos configs to Zookeeper.Note that the Hive driver needs to be greater than 1.3 or 2.0 or apply HIVE-11581 patch.
|
boolean
|
1.4.0
kyuubi\.ha\.zookeeper
\.quorum|
|
The connection string for the zookeeper ensemble
|
string
|
1.0.0
kyuubi\.ha\.zookeeper
\.session\.timeout|
60000
|
The timeout(ms) of a connected session to be idled
|
int
|
1.0.0
diff --git a/kyuubi-ha/src/main/scala/org/apache/kyuubi/ha/HighAvailabilityConf.scala b/kyuubi-ha/src/main/scala/org/apache/kyuubi/ha/HighAvailabilityConf.scala index 291ce69b4..8062b3866 100644 --- a/kyuubi-ha/src/main/scala/org/apache/kyuubi/ha/HighAvailabilityConf.scala +++ b/kyuubi-ha/src/main/scala/org/apache/kyuubi/ha/HighAvailabilityConf.scala @@ -141,10 +141,11 @@ object HighAvailabilityConf { .stringConf .createOptional - val HA_ZK_PUBLIST_CONFIGS: ConfigEntry[Boolean] = + val HA_ZK_PUBLISH_CONFIGS: ConfigEntry[Boolean] = buildConf("ha.zookeeper.publish.configs") - .doc("Whether we should publish Kerberos configs to ZooKeeper.") + .doc("When set to true, publish Kerberos configs to Zookeeper." + + "Note that the Hive driver needs to be greater than 1.3 or 2.0 or apply HIVE-11581 patch.") .version("1.4.0") .booleanConf - .createWithDefault(UserGroupInformation.isSecurityEnabled) + .createWithDefault(false) } diff --git a/kyuubi-ha/src/main/scala/org/apache/kyuubi/ha/client/zookeeper/ServiceDiscoveryClient.scala b/kyuubi-ha/src/main/scala/org/apache/kyuubi/ha/client/zookeeper/ServiceDiscoveryClient.scala index 74d6a5989..f1bf4f104 100644 --- a/kyuubi-ha/src/main/scala/org/apache/kyuubi/ha/client/zookeeper/ServiceDiscoveryClient.scala +++ b/kyuubi-ha/src/main/scala/org/apache/kyuubi/ha/client/zookeeper/ServiceDiscoveryClient.scala @@ -46,7 +46,7 @@ import org.apache.kyuubi.ha.HighAvailabilityConf.HA_ZK_CONN_MAX_RETRY_WAIT import org.apache.kyuubi.ha.HighAvailabilityConf.HA_ZK_ENGINE_REF_ID import org.apache.kyuubi.ha.HighAvailabilityConf.HA_ZK_NAMESPACE import org.apache.kyuubi.ha.HighAvailabilityConf.HA_ZK_NODE_TIMEOUT -import org.apache.kyuubi.ha.HighAvailabilityConf.HA_ZK_PUBLIST_CONFIGS +import org.apache.kyuubi.ha.HighAvailabilityConf.HA_ZK_PUBLISH_CONFIGS import org.apache.kyuubi.ha.client.ServiceDiscovery import org.apache.kyuubi.ha.client.ZooKeeperClientProvider.buildZookeeperClient import org.apache.kyuubi.ha.client.zookeeper.ServiceDiscoveryClient.connectionChecker @@ -187,7 +187,7 @@ object ServiceDiscoveryClient extends Logging { if (external) CreateMode.PERSISTENT_SEQUENTIAL else CreateMode.EPHEMERAL_SEQUENTIAL val znodeData = - if (conf.get(HA_ZK_PUBLIST_CONFIGS) && session.isEmpty) { + if (conf.get(HA_ZK_PUBLISH_CONFIGS) && session.isEmpty) { addConfsToPublish(conf, instance) } else { instance