Skip to content

[SPARK-23491][SS] Remove explicit job cancellation from ContinuousExecution reconfiguring #20622

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
jose-torres wants to merge 4 commits into from
Closed

[SPARK-23491][SS] Remove explicit job cancellation from ContinuousExecution reconfiguring #20622

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0e5e52f
remove job group cancel from continuous processing
jose-torres Feb 22, 2018
ae2d853
add stop/cancel
jose-torres Feb 22, 2018
d404baf
move stops to finally
jose-torres Feb 23, 2018
d3b16c1
add log
jose-torres Feb 23, 2018
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: 6 additions & 2 deletions .../main/scala/org/apache/spark/sql/execution/streaming/continuous/ContinuousExecution.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,9 +236,7 @@ class ContinuousExecution(
startTrigger()

if (reader.needsReconfiguration() && state.compareAndSet(ACTIVE, RECONFIGURING)) {
stopSources()
if (queryExecutionThread.isAlive) {
sparkSession.sparkContext.cancelJobGroup(runId.toString)
queryExecutionThread.interrupt()
}
false
Expand Down Expand Up @@ -266,6 +264,12 @@ class ContinuousExecution(
SQLExecution.withNewExecutionId(
sparkSessionForQuery, lastExecution)(lastExecution.toRdd)
}
} catch {
case t: Throwable
if StreamExecution.isInterruptionException(t) && state.get() == RECONFIGURING =>
stopSources()
sparkSession.sparkContext.cancelJobGroup(runId.toString)

@tdas tdas Feb 23, 2018 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I think its cleaner to put this in the finally since this is the invariant we want when this entire method terminates.

@tdas tdas Feb 23, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

So we only swallow the exception when we are reconfiguration (btw always add logging when swallowing exceptions to leave a trail for debugging), and stopSources() and cancelJobGroups() can be finally as we want that as invariant no matter what happens in this runContinuous method.

// interrupted by reconfiguration - swallow exception so we can restart the query
} finally {

@tdas tdas Feb 22, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Add cancel job here.

epochEndpoint.askSync[Unit](StopContinuousExecutionWrites)
SparkEnv.get.rpcEnv.stop(epochEndpoint)
Expand Down