From b97b02a070f1b6d8a076f24da6a50bef700a1ec7 Mon Sep 17 00:00:00 2001
From: Andrew Or <andrewor14@gmail.com>
Date: Tue, 5 Aug 2014 17:12:26 -0700
Subject: [PATCH] Minor fixes

---
 core/src/main/scala/org/apache/spark/HttpServer.scala      | 2 +-
 .../scala/org/apache/spark/network/ConnectionManager.scala | 3 ++-
 core/src/main/scala/org/apache/spark/ui/JettyUtils.scala   | 3 +--
 core/src/main/scala/org/apache/spark/util/Utils.scala      | 7 +++----
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/core/src/main/scala/org/apache/spark/HttpServer.scala b/core/src/main/scala/org/apache/spark/HttpServer.scala
index ee018ac390f6e..912558d0cab7d 100644
--- a/core/src/main/scala/org/apache/spark/HttpServer.scala
+++ b/core/src/main/scala/org/apache/spark/HttpServer.scala
@@ -72,7 +72,7 @@ private[spark] class HttpServer(
   private def doStart(startPort: Int): (Server, Int) = {
     val server = new Server()
     val connector = new SocketConnector
-    connector.setMaxIdleTime(60*1000)
+    connector.setMaxIdleTime(60 * 1000)
     connector.setSoLingerTime(-1)
     connector.setPort(startPort)
     server.addConnector(connector)
diff --git a/core/src/main/scala/org/apache/spark/network/ConnectionManager.scala b/core/src/main/scala/org/apache/spark/network/ConnectionManager.scala
index f837474b0c6ef..4c00225280cce 100644
--- a/core/src/main/scala/org/apache/spark/network/ConnectionManager.scala
+++ b/core/src/main/scala/org/apache/spark/network/ConnectionManager.scala
@@ -42,7 +42,8 @@ private[spark] class ConnectionManager(
     port: Int,
     conf: SparkConf,
     securityManager: SecurityManager,
-    name: String = "Connection manager") extends Logging {
+    name: String = "Connection manager")
+  extends Logging {
 
   class MessageStatus(
       val message: Message,
diff --git a/core/src/main/scala/org/apache/spark/ui/JettyUtils.scala b/core/src/main/scala/org/apache/spark/ui/JettyUtils.scala
index 220b1bf234aaf..29e9cf947856f 100644
--- a/core/src/main/scala/org/apache/spark/ui/JettyUtils.scala
+++ b/core/src/main/scala/org/apache/spark/ui/JettyUtils.scala
@@ -199,8 +199,7 @@ private[spark] object JettyUtils extends Logging {
       }
     }
 
-    val (server, boundPort) =
-      Utils.startServiceOnPort[Server](port, connect, serverName, maxRetries = 10)
+    val (server, boundPort) = Utils.startServiceOnPort[Server](port, connect, serverName)
     ServerInfo(server, boundPort, collection)
   }
 
diff --git a/core/src/main/scala/org/apache/spark/util/Utils.scala b/core/src/main/scala/org/apache/spark/util/Utils.scala
index accdf2e4439a3..af656837fbe8b 100644
--- a/core/src/main/scala/org/apache/spark/util/Utils.scala
+++ b/core/src/main/scala/org/apache/spark/util/Utils.scala
@@ -1344,14 +1344,13 @@ private[spark] object Utils extends Logging {
 
   /**
    * Attempt to start a service on the given port, or fail after a number of attempts.
-   * Each subsequent attempt uses 1 + the port used in the previous attempt.
+   * Each subsequent attempt uses 1 + the port used in the previous attempt (unless the port is 0).
    *
    * @param startPort The initial port to start the service on.
    * @param maxRetries Maximum number of retries to attempt.
    *                   A value of 3 means attempting ports n, n+1, n+2, and n+3, for example.
    * @param startService Function to start service on a given port.
    *                     This is expected to throw java.net.BindException on port collision.
-   * @throws SparkException When unable to start the service after a given number of attempts
    */
   def startServiceOnPort[T](
       startPort: Int,
@@ -1381,13 +1380,13 @@ private[spark] object Utils extends Logging {
       }
     }
     // Should never happen
-    throw new SparkException(s"Failed to start service on port $startPort")
+    throw new SparkException(s"Failed to start service$serviceString on port $startPort")
   }
 
   /**
    * Return whether the exception is caused by an address-port collision when binding.
    */
-  private def isBindCollision(exception: Throwable): Boolean = {
+  def isBindCollision(exception: Throwable): Boolean = {
     exception match {
       case e: BindException =>
         if (e.getMessage != null && e.getMessage.contains("Address already in use")) {