You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kyuubi.apache.org by cs...@apache.org on 2022/12/12 03:30:53 UTC

[incubator-kyuubi] branch master updated: [KYUUBI #3686] The `authentication.kerberos.principal` value posted to zk should keep the original value

This is an automated email from the ASF dual-hosted git repository.

csy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-kyuubi.git


The following commit(s) were added to refs/heads/master by this push:
     new 494805664 [KYUUBI #3686] The `authentication.kerberos.principal`  value posted to zk should keep the original value
494805664 is described below

commit 49480566402defcfcf36ae03d2dcccc4d7f686b3
Author: yongqian <yo...@trip.com>
AuthorDate: Mon Dec 12 11:30:33 2022 +0800

    [KYUUBI #3686] The `authentication.kerberos.principal`  value posted to zk should keep the original value
    
    ### _Why are the changes needed?_
    
    close #3686
    
    ### _How was this patch tested?_
    - [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible
    
    - [ ] Add screenshots for manual tests if appropriate
    
    - [x] [Run test](https://kyuubi.apache.org/docs/latest/develop_tools/testing.html#running-tests) locally before make a pull request
    
    Closes #3961 from QianyongY/features/kyuubi-3686.
    
    Closes #3686
    
    958432c6 [yongqian] [KYUUBI #3686] The  value posted to zk should keep the original value
    
    Authored-by: yongqian <yo...@trip.com>
    Signed-off-by: Shaoyun Chen <cs...@apache.org>
---
 .../apache/kyuubi/ha/client/zookeeper/ZookeeperDiscoveryClient.scala  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/kyuubi-ha/src/main/scala/org/apache/kyuubi/ha/client/zookeeper/ZookeeperDiscoveryClient.scala b/kyuubi-ha/src/main/scala/org/apache/kyuubi/ha/client/zookeeper/ZookeeperDiscoveryClient.scala
index ca46d1130..521cf8ec4 100644
--- a/kyuubi-ha/src/main/scala/org/apache/kyuubi/ha/client/zookeeper/ZookeeperDiscoveryClient.scala
+++ b/kyuubi-ha/src/main/scala/org/apache/kyuubi/ha/client/zookeeper/ZookeeperDiscoveryClient.scala
@@ -57,7 +57,6 @@ import org.apache.kyuubi.ha.client.ServiceNodeInfo
 import org.apache.kyuubi.ha.client.zookeeper.ZookeeperClientProvider.buildZookeeperClient
 import org.apache.kyuubi.ha.client.zookeeper.ZookeeperClientProvider.getGracefulStopThreadDelay
 import org.apache.kyuubi.ha.client.zookeeper.ZookeeperDiscoveryClient.connectionChecker
-import org.apache.kyuubi.util.KyuubiHadoopUtils
 import org.apache.kyuubi.util.ThreadUtils
 
 class ZookeeperDiscoveryClient(conf: KyuubiConf) extends DiscoveryClient {
@@ -338,8 +337,7 @@ class ZookeeperDiscoveryClient(conf: KyuubiConf) extends DiscoveryClient {
     confsToPublish += ("hive.server2.authentication" -> authenticationMethod)
     if (authenticationMethod.equalsIgnoreCase("KERBEROS")) {
       confsToPublish += ("hive.server2.authentication.kerberos.principal" ->
-        conf.get(KyuubiConf.SERVER_PRINCIPAL).map(KyuubiHadoopUtils.getServerPrincipal)
-          .getOrElse(""))
+        conf.get(KyuubiConf.SERVER_PRINCIPAL).getOrElse(""))
     }
     confsToPublish.map { case (k, v) => k + "=" + v }.mkString(";")
   }