Skip to content

[SPARK-54217][PYTHON] Synchronize PythonRunner's MonitorThread kill decision #52915

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −4
Open

[SPARK-54217][PYTHON] Synchronize PythonRunner's MonitorThread kill decision #52915

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
12 changes: 8 additions & 4 deletions core/src/main/scala/org/apache/spark/api/python/PythonRunner.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,10 +325,10 @@ private[spark] abstract class BasePythonRunner[IN, OUT](
// SPARK-35009: avoid creating multiple monitor threads for the same python worker
// and task context
if (PythonRunner.runningMonitorThreads.add(key)) {
new MonitorThread(SparkEnv.get, worker, context).start()
new MonitorThread(SparkEnv.get, worker, context, releasedOrClosed).start()
}
} else {
new MonitorThread(SparkEnv.get, worker, context).start()
new MonitorThread(SparkEnv.get, worker, context, releasedOrClosed).start()
}

// Return an iterator that read lines from the process's stdout
Expand Down Expand Up @@ -685,7 +685,11 @@ private[spark] abstract class BasePythonRunner[IN, OUT](
* interrupts disabled. In that case we will need to explicitly kill the worker, otherwise the
* threads can block indefinitely.
*/
class MonitorThread(env: SparkEnv, worker: PythonWorker, context: TaskContext)
class MonitorThread(
env: SparkEnv,
worker: PythonWorker,
context: TaskContext,
releasedOrClosed: AtomicBoolean)
extends Thread(s"Worker Monitor for $pythonExec") {

/** How long to wait before killing the python worker if a task cannot be interrupted. */
Expand All @@ -701,7 +705,7 @@ private[spark] abstract class BasePythonRunner[IN, OUT](
}
if (!context.isCompleted()) {
Thread.sleep(taskKillTimeout)
if (!context.isCompleted()) {
if (!context.isCompleted() && releasedOrClosed.compareAndSet(false, true)) {
try {
// Mimic the task name used in `Executor` to help the user find out the task to blame.
val taskName = s"${context.partitionId()}.${context.attemptNumber()} " +
Expand Down