diff options
author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-01-22 15:49:24 -0800 |
---|---|---|
committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-01-22 15:49:24 -0800 |
commit | 151c47eef5b7330103e7749b3e3f3f010511e0b9 (patch) | |
tree | 8edb23088cb71942ff44db76f8f0e636798ada35 | |
parent | 49c78446c83fd26ab6f3b3b168dc40b9e0088a5c (diff) | |
parent | 7e9ee2e8335f085062d3fdeecd0b49ec63e92117 (diff) | |
download | spark-151c47eef5b7330103e7749b3e3f3f010511e0b9.tar.gz spark-151c47eef5b7330103e7749b3e3f3f010511e0b9.tar.bz2 spark-151c47eef5b7330103e7749b3e3f3f010511e0b9.zip |
Merge pull request #399 from NFLabs/master
Fix for hanging spark.HttpFileServer on the kind of virtual network
-rw-r--r-- | core/src/main/scala/spark/HttpServer.scala | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/core/src/main/scala/spark/HttpServer.scala b/core/src/main/scala/spark/HttpServer.scala index 0196595ba1..4e0507c080 100644 --- a/core/src/main/scala/spark/HttpServer.scala +++ b/core/src/main/scala/spark/HttpServer.scala @@ -4,6 +4,7 @@ import java.io.File import java.net.InetAddress import org.eclipse.jetty.server.Server +import org.eclipse.jetty.server.bio.SocketConnector import org.eclipse.jetty.server.handler.DefaultHandler import org.eclipse.jetty.server.handler.HandlerList import org.eclipse.jetty.server.handler.ResourceHandler @@ -27,7 +28,13 @@ private[spark] class HttpServer(resourceBase: File) extends Logging { if (server != null) { throw new ServerStateException("Server is already started") } else { - server = new Server(0) + server = new Server() + val connector = new SocketConnector + connector.setMaxIdleTime(60*1000) + connector.setSoLingerTime(-1) + connector.setPort(0) + server.addConnector(connector) + val threadPool = new QueuedThreadPool threadPool.setDaemon(true) server.setThreadPool(threadPool) |