Skip to content

[SPARK-33143][PYTHON] Add configurable timeout to python server and client #30389

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
gaborgsomogyi wants to merge 14 commits into from
Closed

[SPARK-33143][PYTHON] Add configurable timeout to python server and client #30389

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
09b1235
[SPARK-33143][PYTHON] Add configurable timeout to python server and c…
gaborgsomogyi Nov 16, 2020
17d357b
compile fix
gaborgsomogyi Nov 16, 2020
424be64
PythonRDDSuite fix
gaborgsomogyi Nov 17, 2020
d9feed8
Some cleanup
gaborgsomogyi Nov 17, 2020
6e8e194
Additional trace
gaborgsomogyi Nov 17, 2020
f504af3
Partial review fix
gaborgsomogyi Nov 18, 2020
1595581
Driver side coverage
gaborgsomogyi Nov 19, 2020
a67acd7
Style fix
gaborgsomogyi Nov 20, 2020
0f9e587
Update core/src/test/scala/org/apache/spark/api/python/PythonRDDSuite…
HyukjinKwon Nov 23, 2020
cd2d595
Update core/src/test/scala/org/apache/spark/api/python/PythonRDDSuite…
HyukjinKwon Nov 23, 2020
d9f0a1b
Update core/src/main/scala/org/apache/spark/security/SocketAuthServer…
HyukjinKwon Nov 23, 2020
2913fb1
Update core/src/test/scala/org/apache/spark/api/python/PythonRDDSuite…
HyukjinKwon Nov 23, 2020
ef137b6
Update core/src/test/scala/org/apache/spark/api/python/PythonRDDSuite…
HyukjinKwon Nov 23, 2020
363f3bb
Fix test in PythonRDDSuite
HyukjinKwon Nov 23, 2020
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
Prev Previous commit
Next Next commit
Partial review fix
  • Loading branch information
@gaborgsomogyi
gaborgsomogyi committed Nov 18, 2020
commit f504af38ac0e855c2a97e8341ea53ea971cfe5b5
4 changes: 2 additions & 2 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 @@ -85,7 +85,7 @@ private[spark] abstract class BasePythonRunner[IN, OUT](

private val conf = SparkEnv.get.conf
protected val bufferSize: Int = conf.get(BUFFER_SIZE)
protected val gatewayConnectTimeout = conf.get(PYTHON_GATEWAY_CONNECT_TIMEOUT)
protected val authSocketTimeout = conf.get(PYTHON_AUTH_SOCKET_TIMEOUT)
private val reuseWorker = conf.get(PYTHON_WORKER_REUSE)

// All the Python functions should have the same exec, version and envvars.
Expand Down Expand Up @@ -141,7 +141,7 @@ private[spark] abstract class BasePythonRunner[IN, OUT](
if (workerMemoryMb.isDefined) {
envVars.put("PYSPARK_EXECUTOR_MEMORY_MB", workerMemoryMb.get.toString)
}
envVars.put("SPARK_GATEWAY_CONNECT_TIMEOUT", gatewayConnectTimeout.toString)
envVars.put("SPARK_AUTH_SOCKET_TIMEOUT", authSocketTimeout.toString)
envVars.put("SPARK_BUFFER_SIZE", bufferSize.toString)
val worker: Socket = env.createPythonWorker(pythonExec, envVars.asScala.toMap)
// Whether is the worker released into idle pool or closed. When any codes try to release or
Expand Down
3 changes: 2 additions & 1 deletion core/src/main/scala/org/apache/spark/internal/config/Python.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ private[spark] object Python {
.bytesConf(ByteUnit.MiB)
.createOptional

val PYTHON_GATEWAY_CONNECT_TIMEOUT = ConfigBuilder("spark.python.gateway.connectTimeout")
val PYTHON_AUTH_SOCKET_TIMEOUT = ConfigBuilder("spark.python.authenticate.socketTimeout")
.internal()
.version("3.1.0")
.timeConf(TimeUnit.SECONDS)
.createWithDefaultString("15s")
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/scala/org/apache/spark/security/SocketAuthServer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import scala.util.Try

import org.apache.spark.SparkEnv
import org.apache.spark.internal.Logging
import org.apache.spark.internal.config.Python.PYTHON_GATEWAY_CONNECT_TIMEOUT
import org.apache.spark.internal.config.Python.PYTHON_AUTH_SOCKET_TIMEOUT
import org.apache.spark.network.util.JavaUtils
import org.apache.spark.util.{ThreadUtils, Utils}

Expand All @@ -51,7 +51,7 @@ private[spark] abstract class SocketAuthServer[T](
logTrace("Creating listening socket")
val serverSocket = new ServerSocket(0, 1, InetAddress.getByAddress(Array(127, 0, 0, 1)))
// Close the socket if no connection in configured seconds
Copy link
Member

@dongjoon-hyun dongjoon-hyun Nov 20, 2020

Choose a reason for hiding this comment

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

in configured -> in the configured?

val timeout = SparkEnv.get.conf.get(PYTHON_GATEWAY_CONNECT_TIMEOUT).toInt
val timeout = SparkEnv.get.conf.get(PYTHON_AUTH_SOCKET_TIMEOUT).toInt
logTrace(s"Setting timeout to $timeout sec")
serverSocket.setSoTimeout(timeout * 1000)

Expand Down
2 changes: 1 addition & 1 deletion python/pyspark/java_gateway.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ def local_connect_and_auth(port, auth_secret):
af, socktype, proto, _, sa = res
try:
sock = socket.socket(af, socktype, proto)
sock.settimeout(int(os.environ.get("SPARK_GATEWAY_CONNECT_TIMEOUT", 15)))
sock.settimeout(int(os.environ.get("SPARK_AUTH_SOCKET_TIMEOUT", 15)))
sock.connect(sa)
sockfile = sock.makefile("rwb", int(os.environ.get("SPARK_BUFFER_SIZE", 65536)))
_do_server_auth(sockfile, auth_secret)
Expand Down