aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorDavies Liu <davies@databricks.com>2015-04-02 12:18:33 -0700
committerJosh Rosen <joshrosen@databricks.com>2015-04-02 12:18:33 -0700
commit0cce5451adfc6bf4661bcf67aca3db26376455fe (patch)
tree145c47ad89bf382ce722fbfdfc10e16dae0a55ef /core
parent424e987dfebbbaa37f4496d44090d469a931ce76 (diff)
downloadspark-0cce5451adfc6bf4661bcf67aca3db26376455fe.tar.gz
spark-0cce5451adfc6bf4661bcf67aca3db26376455fe.tar.bz2
spark-0cce5451adfc6bf4661bcf67aca3db26376455fe.zip
[SPARK-6667] [PySpark] remove setReuseAddress
The reused address on server side had caused the server can not acknowledge the connected connections, remove it. This PR will retry once after timeout, it also add a timeout at client side. Author: Davies Liu <davies@databricks.com> Closes #5324 from davies/collect_hang and squashes the following commits: e5a51a2 [Davies Liu] remove setReuseAddress 7977c2f [Davies Liu] do retry on client side b838f35 [Davies Liu] retry after timeout
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/org/apache/spark/api/python/PythonRDD.scala1
1 files changed, 0 insertions, 1 deletions
diff --git a/core/src/main/scala/org/apache/spark/api/python/PythonRDD.scala b/core/src/main/scala/org/apache/spark/api/python/PythonRDD.scala
index 19f4c95fca..36cf2af085 100644
--- a/core/src/main/scala/org/apache/spark/api/python/PythonRDD.scala
+++ b/core/src/main/scala/org/apache/spark/api/python/PythonRDD.scala
@@ -605,7 +605,6 @@ private[spark] object PythonRDD extends Logging {
*/
private def serveIterator[T](items: Iterator[T], threadName: String): Int = {
val serverSocket = new ServerSocket(0, 1)
- serverSocket.setReuseAddress(true)
// Close the socket if no connection in 3 seconds
serverSocket.setSoTimeout(3000)