[incubator-kyuubi] branch branch-1.3 updated: [KYUUBI #1057] [KYUUBI#1056] Output error log when currentEngine is None

[yao]

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

yao 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 6a183f9  [KYUUBI #1057] [KYUUBI#1056] Output error log when 
currentEngine is None
6a183f9 is described below

commit 6a183f9d1ec41eadfb11171c6ccc82ec56109070
Author: hongdongdong <hongdongd...@cmss.chinamobile.com>
AuthorDate: Thu Sep 9 13:37:31 2021 +0800

    [KYUUBI #1057] [KYUUBI#1056] Output error log when currentEngine is None
    
    <!--
    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.
    -->
    When createSpark in SparkSqlEngine get sparksession or execute 
initialize.sql failed, we cannot get any error info in logs. At this time, 
currentEngine is None.
    
    ### _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 #1057 from hddong/engine-fix.
    
    Closes #1057
    
    44ead3b3 [hongdongdong] fix
    3462d36c [hongdongdong] [KYUUBI#1056] Output error log when currentEngine 
is None
    
    Authored-by: hongdongdong <hongdongd...@cmss.chinamobile.com>
    Signed-off-by: Kent Yao <y...@apache.org>
    (cherry picked from commit 888651353482ba49abe7c8077ac478ec795e2b97)
    Signed-off-by: Kent Yao <y...@apache.org>
---
 .../main/scala/org/apache/kyuubi/engine/spark/SparkSQLEngine.scala    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/SparkSQLEngine.scala
 
b/externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/SparkSQLEngine.scala
index b21fa35..e5aa729 100644
--- 
a/externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/SparkSQLEngine.scala
+++ 
b/externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/SparkSQLEngine.scala
@@ -146,7 +146,7 @@ object SparkSQLEngine extends Logging {
       // blocking main thread
       countDownLatch.await()
     } catch {
-      case t: Throwable =>
+      case t: Throwable if currentEngine.isDefined =>
         currentEngine.foreach { engine =>
           val status =
             engine.engineStatus.copy(diagnostic = s"Error State SparkSQL 
Engine ${t.getMessage}")
@@ -154,6 +154,8 @@ object SparkSQLEngine extends Logging {
           error(status, t)
           engine.stop()
         }
+      case t: Throwable =>
+        error("Create SparkSQL Engine Failed", t)
     } finally {
       if (spark != null) {
         spark.stop()