You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by an...@apache.org on 2014/09/17 01:03:29 UTC
git commit: [SPARK-3555] Fix UISuite race condition
Repository: spark
Updated Branches:
refs/heads/master a6e1712f1 -> 0a7091e68
[SPARK-3555] Fix UISuite race condition
The test "jetty selects different port under contention" is flaky.
If another process binds to 4040 before the test starts, then the first server we start there will fail, and the subsequent servers we start thereafter may successfully bind to 4040 if it was released between the servers starting. Instead, we should just let Java find a random free port for us and hold onto it for the duration of the test.
Author: Andrew Or <an...@gmail.com>
Closes #2418 from andrewor14/fix-port-contention and squashes the following commits:
0cd4974 [Andrew Or] Stop them servers
a7071fe [Andrew Or] Pick random port instead of 4040
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/0a7091e6
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/0a7091e6
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/0a7091e6
Branch: refs/heads/master
Commit: 0a7091e689a4c8b1e7b61e9f0873e6557f40d952
Parents: a6e1712
Author: Andrew Or <an...@gmail.com>
Authored: Tue Sep 16 16:03:20 2014 -0700
Committer: Andrew Or <an...@gmail.com>
Committed: Tue Sep 16 16:03:20 2014 -0700
----------------------------------------------------------------------
core/src/test/scala/org/apache/spark/ui/UISuite.scala | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/0a7091e6/core/src/test/scala/org/apache/spark/ui/UISuite.scala
----------------------------------------------------------------------
diff --git a/core/src/test/scala/org/apache/spark/ui/UISuite.scala b/core/src/test/scala/org/apache/spark/ui/UISuite.scala
index 48790b5..92a21f8 100644
--- a/core/src/test/scala/org/apache/spark/ui/UISuite.scala
+++ b/core/src/test/scala/org/apache/spark/ui/UISuite.scala
@@ -23,7 +23,6 @@ import javax.servlet.http.HttpServletRequest
import scala.io.Source
import scala.util.{Failure, Success, Try}
-import org.eclipse.jetty.server.Server
import org.eclipse.jetty.servlet.ServletContextHandler
import org.scalatest.FunSuite
import org.scalatest.concurrent.Eventually._
@@ -108,14 +107,8 @@ class UISuite extends FunSuite {
}
test("jetty selects different port under contention") {
- val startPort = 4040
- val server = new Server(startPort)
-
- Try { server.start() } match {
- case Success(s) =>
- case Failure(e) =>
- // Either case server port is busy hence setup for test complete
- }
+ val server = new ServerSocket(0)
+ val startPort = server.getLocalPort
val serverInfo1 = JettyUtils.startJettyServer(
"0.0.0.0", startPort, Seq[ServletContextHandler](), new SparkConf)
val serverInfo2 = JettyUtils.startJettyServer(
@@ -126,6 +119,9 @@ class UISuite extends FunSuite {
assert(boundPort1 != startPort)
assert(boundPort2 != startPort)
assert(boundPort1 != boundPort2)
+ serverInfo1.server.stop()
+ serverInfo2.server.stop()
+ server.close()
}
test("jetty binds to port 0 correctly") {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org