Skip to content

Commit

Permalink
[KYUUBI #1057] [KYUUBI#1056] Output error log when currentEngine is None
Browse files Browse the repository at this point in the history
<!--
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

44ead3b [hongdongdong] fix
3462d36 [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 8886513)
Signed-off-by: Kent Yao <yao@apache.org>
  • Loading branch information
hddong authored and yaooqinn committed Sep 9, 2021
1 parent 8be8c0f commit 6a183f9
Showing 1 changed file with 3 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -146,14 +146,16 @@ 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}")
EventLoggingService.onEvent(status)
error(status, t)
engine.stop()
}
case t: Throwable =>
error("Create SparkSQL Engine Failed", t)
} finally {
if (spark != null) {
spark.stop()
Expand Down

0 comments on commit 6a183f9

Please sign in to comment.