[incubator-kyuubi] branch master updated: [KYUUBI #1449] Fix when KyuubiServer initialize fail but not exit

[ya...@apache.org]

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

yao 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 5a4e370  [KYUUBI #1449] Fix when KyuubiServer initialize fail but not exit
5a4e370 is described below

commit 5a4e3707cac9ddcc331d5ba933ddd5b51fa2515c
Author: zhenjiaguo <zh...@163.com>
AuthorDate: Wed Dec 1 18:46:00 2021 +0800

    [KYUUBI #1449] Fix when KyuubiServer initialize fail but not exit
    
    <!--
    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.
    -->
    
    Kyuubi server should exit when initialize fail.
    
    Detail see #1449.
    
    ### _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 #1468 from zhenjiaguo/fix-TBFS-init-fail-not-exit.
    
    Closes #1449
    
    4467a249 [zhenjiaguo] add status judgment before zkServer stop
    4208663e [zhenjiaguo] stop zkServer when kyuubi server init fail
    1ff3a825 [zhenjiaguo] try catch server initialize
    
    Authored-by: zhenjiaguo <zh...@163.com>
    Signed-off-by: Kent Yao <ya...@apache.org>
---
 .../src/main/scala/org/apache/kyuubi/server/KyuubiServer.scala | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/KyuubiServer.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/server/KyuubiServer.scala
index 2d200c4..3196f69 100644
--- a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/KyuubiServer.scala
+++ b/kyuubi-server/src/main/scala/org/apache/kyuubi/server/KyuubiServer.scala
@@ -90,7 +90,15 @@ object KyuubiServer extends Logging {
     }
 
     val server = new KyuubiServer()
-    server.initialize(conf)
+    try {
+      server.initialize(conf)
+    } catch {
+      case e: Exception =>
+        if (zkServer.getServiceState == ServiceState.STARTED) {
+          zkServer.stop()
+        }
+        throw e
+    }
     server.start()
     Utils.addShutdownHook(() => server.stop(), Utils.SERVER_SHUTDOWN_PRIORITY)
     server