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

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


The following commit(s) were added to refs/heads/branch-1.3 by this push:
     new 2a080d3  [KYUUBI #1005] ServiceDiscoverySuite fails if hostname 
contains uppercase letter
2a080d3 is described below

commit 2a080d374b612e89f109079b2e312cd24df7c15f
Author: zhouyifan279 <[email protected]>
AuthorDate: Tue Aug 31 20:36:37 2021 +0800

    [KYUUBI #1005] ServiceDiscoverySuite fails if hostname contains uppercase 
letter
    
    <!--
    Thanks for sending a pull request!
    
    Here are some tips for you:
      1. If this is your first time, please read our contributor guidelines: 
https://kyuubi.readthedocs.io/en/latest/community/contributions.html
      2. If the PR is related to an issue in 
https://github.com/apache/incubator-kyuubi/issues, add '[KYUUBI #XXXX]' in your 
PR title, e.g., '[KYUUBI #XXXX] Your PR title ...'.
      3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., 
'[WIP][KYUUBI #XXXX] Your PR title ...'.
    -->
    
    ### _Why are the changes needed?_
    <!--
    Please clarify why the changes are needed. For instance,
      1. If you add a feature, you can talk about the use case of it.
      2. If you fix a bug, you can clarify why it is a bug.
    -->
    Executing test case "ServiceDiscoverySuite set up zookeeper auth" on a 
Linux host named "KYUUBI" fails.
    
    ### _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.readthedocs.io/en/latest/develop_tools/testing.html#running-tests)
 locally before make a pull request
    
    Closes #1006 from zhouyifan279/KYUUBI#1005.
    
    Closes #1005
    
    045c6b34 [zhouyifan279] [KYUUBI #1005] ServiceDiscoverySuite fails if 
hostname contains uppercase letter
    
    Authored-by: zhouyifan279 <[email protected]>
    Signed-off-by: Cheng Pan <[email protected]>
    (cherry picked from commit 866a63d7a7adb6baeb68c02df39a463887550d1e)
    Signed-off-by: Cheng Pan <[email protected]>
---
 .../scala/org/apache/kyuubi/ha/client/ServiceDiscoverySuite.scala    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/kyuubi-ha/src/test/scala/org/apache/kyuubi/ha/client/ServiceDiscoverySuite.scala
 
b/kyuubi-ha/src/test/scala/org/apache/kyuubi/ha/client/ServiceDiscoverySuite.scala
index 8e870ef..2217e80 100644
--- 
a/kyuubi-ha/src/test/scala/org/apache/kyuubi/ha/client/ServiceDiscoverySuite.scala
+++ 
b/kyuubi-ha/src/test/scala/org/apache/kyuubi/ha/client/ServiceDiscoverySuite.scala
@@ -23,6 +23,7 @@ import javax.security.auth.login.Configuration
 
 import scala.collection.JavaConverters._
 
+import org.apache.hadoop.util.StringUtils
 import org.apache.zookeeper.ZooDefs
 import org.scalatest.time.SpanSugar._
 
@@ -125,8 +126,8 @@ class ServiceDiscoverySuite extends KerberizedTestHelper {
       assert(entries.head.getLoginModuleName === 
"com.sun.security.auth.module.Krb5LoginModule")
       val options = entries.head.getOptions.asScala.toMap
 
-      assert(options("principal") ===
-        s"kentyao/${InetAddress.getLocalHost.getCanonicalHostName}@apache.org")
+      val hostname = 
StringUtils.toLowerCase(InetAddress.getLocalHost.getCanonicalHostName)
+      assert(options("principal") === s"kentyao/[email protected]")
       assert(options("useKeyTab").toString.toBoolean)
 
       conf.set(KyuubiConf.SERVER_KEYTAB, keytab.getName)

Reply via email to