Skip to content

[SPARK-21738] Thriftserver doesn't cancel jobs when session is closed #18951

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
mgaido91 wants to merge 1 commit into from
Closed

[SPARK-21738] Thriftserver doesn't cancel jobs when session is closed #18951

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 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 @@ -71,9 +71,9 @@ private[hive] class SparkExecuteStatementOperation(

def close(): Unit = {
// RDDs will be cleaned automatically upon garbage collection.
sqlContext.sparkContext.clearJobGroup()
logDebug(s"CLOSING $statementId")
cleanup(OperationState.CLOSED)
sqlContext.sparkContext.clearJobGroup()
}

def addNonNullColumnValue(from: SparkRow, to: ArrayBuffer[Any], ordinal: Int) {
Expand Down Expand Up @@ -273,9 +273,6 @@ private[hive] class SparkExecuteStatementOperation(

override def cancel(): Unit = {
logInfo(s"Cancel '$statement' with $statementId")
if (statementId != null) {
sqlContext.sparkContext.cancelJobGroup(statementId)
}
cleanup(OperationState.CANCELED)
}

Expand All @@ -287,6 +284,9 @@ private[hive] class SparkExecuteStatementOperation(
backgroundHandle.cancel(true)
}
}
if (statementId != null) {
sqlContext.sparkContext.cancelJobGroup(statementId)
}
}
}

Expand Down