Skip to content

[SPARK-53900][CONNECT] Fix unintentional Thread.wait(0) under rare conditions in ExecuteGrpcResponseSender #52609

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

[SPARK-53900][CONNECT] Fix unintentional Thread.wait(0) under rare conditions in ExecuteGrpcResponseSender #52609

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
4 changes: 2 additions & 2 deletions ...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 @@ -263,7 +263,7 @@ private[connect] class ExecuteGrpcResponseSender[T <: Message](
timeoutNs = Math.min(progressTimeout * NANOS_PER_MILLIS, timeoutNs)
}
logTrace(s"Wait for response to become available with timeout=$timeoutNs ns.")
executionObserver.responseLock.wait(timeoutNs / NANOS_PER_MILLIS)
executionObserver.responseLock.wait(Math.max(1, timeoutNs / NANOS_PER_MILLIS))
enqueueProgressMessage(force = true)
logTrace(s"Reacquired executionObserver lock after waiting.")
sleepEnd = System.nanoTime()
Expand Down Expand Up @@ -384,7 +384,7 @@ private[connect] class ExecuteGrpcResponseSender[T <: Message](
val timeoutNs = Math.max(1, deadlineTimeNs - System.nanoTime())
var sleepStart = System.nanoTime()
logTrace(s"Wait for grpcCallObserver to become ready with timeout=$timeoutNs ns.")
grpcCallObserverReadySignal.wait(timeoutNs / NANOS_PER_MILLIS)
grpcCallObserverReadySignal.wait(Math.max(1, timeoutNs / NANOS_PER_MILLIS))
logTrace(s"Reacquired grpcCallObserverReadySignal lock after waiting.")
sleepEnd = System.nanoTime()
}
Expand Down