Skip to content

[SPARK-29036][SQL]SparkThriftServer cancel job after execute() thread interrupted #25743

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
AngersZhuuuu wants to merge 6 commits into from
Closed

[SPARK-29036][SQL]SparkThriftServer cancel job after execute() thread interrupted #25743

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c3de557
save change
AngersZhuuuu Sep 10, 2019
2cf3153
Revert "save change"
AngersZhuuuu Sep 10, 2019
e5cd06c
Merge remote-tracking branch 'upstream/master'
AngersZhuuuu Sep 10, 2019
b047e76
cancel jobGroup after catch error
AngersZhuuuu Sep 10, 2019
202f5ee
add comment
AngersZhuuuu Sep 12, 2019
232ef81
modify comment
AngersZhuuuu Sep 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions ...rc/main/scala/org/apache/spark/sql/hive/thriftserver/SparkExecuteStatementOperation.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,13 @@ private[hive] class SparkExecuteStatementOperation(
// Actually do need to catch Throwable as some failures don't inherit from Exception and
// HiveServer will silently swallow them.
case e: Throwable =>
// When cancel() or close() is called very quickly after the query is started,
// then they may both call cleanup() before Spark Jobs are started. But before background
// task interrupted, it may have start some spark job, so we need to cancel again to
// make sure job was cancelled when background thread was interrupted
if (statementId != null) {
Copy link
Member

@wangyum wangyum Sep 12, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we add a comment explaining why we need this change?

sqlContext.sparkContext.cancelJobGroup(statementId)
}
val currentState = getStatus().getState()
if (currentState.isTerminal) {
// This may happen if the execution was cancelled, and then closed from another thread.
Expand Down