ueshin commented on code in PR #50466:
URL: https://github.com/apache/spark/pull/50466#discussion_r2025803146
##########
core/src/main/scala/org/apache/spark/api/python/PythonRunner.scala:
##########
@@ -401,25 +415,27 @@ private[spark] abstract class BasePythonRunner[IN, OUT](
}
}.start()
}
- val secret = if (isBarrier) {
+ val secret = if (isBarrier && !isUnixDomainSock) {
authHelper.secret
} else {
""
}
if (isBarrier) {
// Close ServerSocket on task completion.
- serverSocket.foreach { server =>
+ serverSocketChannel.foreach { server =>
context.addTaskCompletionListener[Unit](_ => server.close())
}
- val boundPort: Int = serverSocket.map(_.getLocalPort).getOrElse(0)
- if (boundPort == -1) {
- val message = "ServerSocket failed to bind to Java side."
- logError(message)
- throw new SparkException(message)
Review Comment:
Don't we need this?
##########
core/src/main/scala/org/apache/spark/api/python/PythonRunner.scala:
##########
@@ -356,27 +360,36 @@ private[spark] abstract class BasePythonRunner[IN, OUT](
// Init a ServerSocket to accept method calls from Python side.
val isBarrier = context.isInstanceOf[BarrierTaskContext]
if (isBarrier) {
- serverSocket = Some(new ServerSocket(/* port */ 0,
- /* backlog */ 1,
- InetAddress.getByName("localhost")))
- // A call to accept() for ServerSocket shall block infinitely.
- serverSocket.foreach(_.setSoTimeout(0))
+ if (isUnixDomainSock) {
+ serverSocketChannel =
Some(ServerSocketChannel.open(StandardProtocolFamily.UNIX))
+ sockPath.deleteOnExit()
+
serverSocketChannel.get.bind(UnixDomainSocketAddress.of(sockPath.getPath))
+ } else {
+ serverSocketChannel = Some(ServerSocketChannel.open())
+ serverSocketChannel.foreach(_.bind(
+ new InetSocketAddress(InetAddress.getLoopbackAddress(), 0), 1))
+ serverSocketChannel.foreach(_.socket().setSoTimeout(0))
+ }
+
+ serverSocketChannel.foreach(_.configureBlocking(true))
Review Comment:
Do we need to call this?
##########
core/src/main/scala/org/apache/spark/api/python/PythonRunner.scala:
##########
@@ -356,27 +360,36 @@ private[spark] abstract class BasePythonRunner[IN, OUT](
// Init a ServerSocket to accept method calls from Python side.
val isBarrier = context.isInstanceOf[BarrierTaskContext]
if (isBarrier) {
- serverSocket = Some(new ServerSocket(/* port */ 0,
- /* backlog */ 1,
- InetAddress.getByName("localhost")))
- // A call to accept() for ServerSocket shall block infinitely.
- serverSocket.foreach(_.setSoTimeout(0))
+ if (isUnixDomainSock) {
+ serverSocketChannel =
Some(ServerSocketChannel.open(StandardProtocolFamily.UNIX))
+ sockPath.deleteOnExit()
+
serverSocketChannel.get.bind(UnixDomainSocketAddress.of(sockPath.getPath))
+ } else {
+ serverSocketChannel = Some(ServerSocketChannel.open())
+ serverSocketChannel.foreach(_.bind(
+ new InetSocketAddress(InetAddress.getLoopbackAddress(), 0), 1))
+ serverSocketChannel.foreach(_.socket().setSoTimeout(0))
+ }
+
+ serverSocketChannel.foreach(_.configureBlocking(true))
+
new Thread("accept-connections") {
setDaemon(true)
override def run(): Unit = {
- while (!serverSocket.get.isClosed()) {
- var sock: Socket = null
+ while (serverSocketChannel.get.isOpen()) {
+ var sock: SocketChannel = null
try {
- sock = serverSocket.get.accept()
+ sock = serverSocketChannel.get.accept()
+ sock.configureBlocking(true)
Review Comment:
ditto.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
