[SPARK-20345][SQL] Fix STS error handling logic on HiveSQLException #17643
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Test build #75826 has finished for PR 17643 at commit
|
dongjoon-hyun
changed the title
dongjoon-hyun
commented
May 30, 2017
| @@ -253,6 +253,8 @@ private[hive] class SparkExecuteStatementOperation( | |||
| return | |||
| } else { | |||
| setState(OperationState.ERROR) | |||
| HiveThriftServer2.listener.onStatementError( | |||
| statementId, e.getMessage, SparkUtils.exceptionString(e)) | |||
There was a problem hiding this comment.
This is the same logic like line 265.
|
Test build #77553 has finished for PR 17643 at commit
|
|
Hi, @gatorsmile . |
|
retest this please |
|
Thank you for review, @gatorsmile ! |
|
Test build #77945 has finished for PR 17643 at commit
|
asfgit
pushed a commit
that referenced
this pull request
Jun 12, 2017
## What changes were proposed in this pull request? [SPARK-5100](343d3bf) added Spark Thrift Server(STS) UI and the following logic to handle exceptions on case `Throwable`. ```scala HiveThriftServer2.listener.onStatementError( statementId, e.getMessage, SparkUtils.exceptionString(e)) ``` However, there occurred a missed case after implementing [SPARK-6964](eb19d3f75cbd002f7e72ce02017a8de67f562792)'s `Support Cancellation in the Thrift Server` by adding case `HiveSQLException` before case `Throwable`. ```scala case e: HiveSQLException => if (getStatus().getState() == OperationState.CANCELED) { return } else { setState(OperationState.ERROR) throw e } // Actually do need to catch Throwable as some failures don't inherit from Exception and // HiveServer will silently swallow them. case e: Throwable => val currentState = getStatus().getState() logError(s"Error executing query, currentState $currentState, ", e) setState(OperationState.ERROR) HiveThriftServer2.listener.onStatementError( statementId, e.getMessage, SparkUtils.exceptionString(e)) throw new HiveSQLException(e.toString) ``` Logically, we had better add `HiveThriftServer2.listener.onStatementError` on case `HiveSQLException`, too. ## How was this patch tested? N/A Author: Dongjoon Hyun <dongjoon@apache.org> Closes #17643 from dongjoon-hyun/SPARK-20345. (cherry picked from commit 32818d9) Signed-off-by: Xiao Li <gatorsmile@gmail.com>
|
Thanks! Merging to master/2.2 |
|
Thank you so much! |
dataknocker
pushed a commit
to dataknocker/spark
that referenced
this pull request
Jun 16, 2017
## What changes were proposed in this pull request? [SPARK-5100](apache@343d3bf) added Spark Thrift Server(STS) UI and the following logic to handle exceptions on case `Throwable`. ```scala HiveThriftServer2.listener.onStatementError( statementId, e.getMessage, SparkUtils.exceptionString(e)) ``` However, there occurred a missed case after implementing [SPARK-6964](apache@eb19d3f75cbd002f7e72ce02017a8de67f562792)'s `Support Cancellation in the Thrift Server` by adding case `HiveSQLException` before case `Throwable`. ```scala case e: HiveSQLException => if (getStatus().getState() == OperationState.CANCELED) { return } else { setState(OperationState.ERROR) throw e } // Actually do need to catch Throwable as some failures don't inherit from Exception and // HiveServer will silently swallow them. case e: Throwable => val currentState = getStatus().getState() logError(s"Error executing query, currentState $currentState, ", e) setState(OperationState.ERROR) HiveThriftServer2.listener.onStatementError( statementId, e.getMessage, SparkUtils.exceptionString(e)) throw new HiveSQLException(e.toString) ``` Logically, we had better add `HiveThriftServer2.listener.onStatementError` on case `HiveSQLException`, too. ## How was this patch tested? N/A Author: Dongjoon Hyun <dongjoon@apache.org> Closes apache#17643 from dongjoon-hyun/SPARK-20345.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
SPARK-5100 added Spark Thrift Server(STS) UI and the following logic to handle exceptions on case
Throwable.However, there occurred a missed case after implementing SPARK-6964's
Support Cancellation in the Thrift Serverby adding caseHiveSQLExceptionbefore caseThrowable.Logically, we had better add
HiveThriftServer2.listener.onStatementErroron caseHiveSQLException, too.How was this patch tested?
N/A