Skip to content

[SPARK-50748][SPARK-50889][CONNECT][4.0] Fix a race condition issue which happens when operations are interrupted #51671

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

[SPARK-50748][SPARK-50889][CONNECT][4.0] Fix a race condition issue which happens when operations are interrupted #51671

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion ...ver/src/main/scala/org/apache/spark/sql/connect/execution/ExecuteGrpcResponseSender.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,8 @@ private[connect] class ExecuteGrpcResponseSender[T <: Message](
// 2. has a response to send
def gotResponse = response.nonEmpty
// 3. sent everything from the stream and the stream is finished
def streamFinished = executionObserver.getLastResponseIndex().exists(nextIndex > _)
def streamFinished = executionObserver.getLastResponseIndex().exists(nextIndex > _) ||
executionObserver.isCleaned()
// 4. time deadline or size limit reached
def deadlineLimitReached =
sentResponsesSize > maximumResponseSize || deadlineTimeNs < System.nanoTime()
Expand Down
5 changes: 5 additions & 0 deletions ...erver/src/main/scala/org/apache/spark/sql/connect/execution/ExecuteResponseObserver.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,11 @@ private[connect] class ExecuteResponseObserver[T <: Message](val executeHolder:
finalProducedIndex.isDefined
}

// Returns if this observer has already been cleaned
def isCleaned(): Boolean = responseLock.synchronized {
completed() && responses.isEmpty
}

// For testing.
private[connect] def undoCompletion(): Unit = responseLock.synchronized {
finalProducedIndex = None
Expand Down