[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 <hongdongdong@cmss.chinamobile.com>
Signed-off-by: Kent Yao <yao@apache.org>
(cherry picked from commit 8886513534)
Signed-off-by: Kent Yao <yao@apache.org>
This commit is contained in:
hongdongdong 2021-09-09 13:37:31 +08:00 committed by Kent Yao
parent 8be8c0f314
commit 6a183f9d1e
No known key found for this signature in database
GPG Key ID: F7051850A0AF904D

View File

@ -146,7 +146,7 @@ object SparkSQLEngine extends Logging {
// blocking main thread // blocking main thread
countDownLatch.await() countDownLatch.await()
} catch { } catch {
case t: Throwable => case t: Throwable if currentEngine.isDefined =>
currentEngine.foreach { engine => currentEngine.foreach { engine =>
val status = val status =
engine.engineStatus.copy(diagnostic = s"Error State SparkSQL Engine ${t.getMessage}") engine.engineStatus.copy(diagnostic = s"Error State SparkSQL Engine ${t.getMessage}")
@ -154,6 +154,8 @@ object SparkSQLEngine extends Logging {
error(status, t) error(status, t)
engine.stop() engine.stop()
} }
case t: Throwable =>
error("Create SparkSQL Engine Failed", t)
} finally { } finally {
if (spark != null) { if (spark != null) {
spark.stop() spark.stop()