Skip to content

[SPARK-44433][PYTHON][CONNECT][SS][FOLLOWUP]Set back USE_DAEMON after creating streaming python processes #42341

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
WweiL wants to merge 3 commits into from
Closed

[SPARK-44433][PYTHON][CONNECT][SS][FOLLOWUP]Set back USE_DAEMON after creating streaming python processes #42341

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4eb617b
finish
WweiL Aug 4, 2023
ea5dac2
minor
WweiL Aug 4, 2023
70c1379
remove conf recover in stop runner
WweiL Aug 4, 2023
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
26 changes: 19 additions & 7 deletions core/src/main/scala/org/apache/spark/api/python/StreamingPythonRunner.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,19 @@ private[spark] class StreamingPythonRunner(

envVars.put("SPARK_AUTH_SOCKET_TIMEOUT", authSocketTimeout.toString)
envVars.put("SPARK_BUFFER_SIZE", bufferSize.toString)
conf.set(PYTHON_USE_DAEMON, false)
envVars.put("SPARK_CONNECT_LOCAL_URL", connectUrl)

val (worker, _) = env.createPythonWorker(
pythonExec, workerModule, envVars.asScala.toMap)
pythonWorker = Some(worker)
val prevConf = conf.get(PYTHON_USE_DAEMON)
conf.set(PYTHON_USE_DAEMON, false)
try {
val (worker, _) = env.createPythonWorker(
pythonExec, workerModule, envVars.asScala.toMap)
pythonWorker = Some(worker)
} finally {
conf.set(PYTHON_USE_DAEMON, prevConf)
}

val stream = new BufferedOutputStream(worker.getOutputStream, bufferSize)
val stream = new BufferedOutputStream(pythonWorker.get.getOutputStream, bufferSize)
val dataOut = new DataOutputStream(stream)

// TODO(SPARK-44461): verify python version
Expand All @@ -87,7 +92,8 @@ private[spark] class StreamingPythonRunner(
dataOut.write(command.toArray)
dataOut.flush()

val dataIn = new DataInputStream(new BufferedInputStream(worker.getInputStream, bufferSize))
val dataIn = new DataInputStream(
new BufferedInputStream(pythonWorker.get.getInputStream, bufferSize))

val resFromPython = dataIn.readInt()
logInfo(s"Runner initialization returned $resFromPython")
Expand All @@ -100,7 +106,13 @@ private[spark] class StreamingPythonRunner(
*/
def stop(): Unit = {
pythonWorker.foreach { worker =>
SparkEnv.get.destroyPythonWorker(pythonExec, workerModule, envVars.asScala.toMap, worker)
val prevConf = conf.get(PYTHON_USE_DAEMON)
conf.set(PYTHON_USE_DAEMON, false)
try {
SparkEnv.get.destroyPythonWorker(pythonExec, workerModule, envVars.asScala.toMap, worker)
} finally {
conf.set(PYTHON_USE_DAEMON, prevConf)
}
Copy link
Member

@ueshin ueshin Aug 4, 2023

Choose a reason for hiding this comment

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

I don't think this change is needed as env.destroyPythonWorker won't refer conf.

}
}
}