diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-08-19 18:35:47 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-08-19 18:51:00 -0700 |
| commit | 793a722f8e14552b8d36f46cca39d336dc2df9dd (patch) | |
| tree | 9d23aa924697854ff84d3b1fe03361819e727a53 | |
| parent | 498a26189b197bdaf4be47e6a8baca7b97fe9064 (diff) | |
| download | spark-793a722f8e14552b8d36f46cca39d336dc2df9dd.tar.gz spark-793a722f8e14552b8d36f46cca39d336dc2df9dd.tar.bz2 spark-793a722f8e14552b8d36f46cca39d336dc2df9dd.zip | |
Allow some wiggle room in UISuite port test and in EC2 ports
| -rw-r--r-- | core/src/test/scala/spark/ui/UISuite.scala | 5 | ||||
| -rwxr-xr-x | ec2/spark_ec2.py | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/core/src/test/scala/spark/ui/UISuite.scala b/core/src/test/scala/spark/ui/UISuite.scala index 41cb0e0a35..735a794396 100644 --- a/core/src/test/scala/spark/ui/UISuite.scala +++ b/core/src/test/scala/spark/ui/UISuite.scala @@ -30,8 +30,9 @@ class UISuite extends FunSuite { val (jettyServer1, boundPort1) = JettyUtils.startJettyServer("localhost", startPort, Seq()) val (jettyServer2, boundPort2) = JettyUtils.startJettyServer("localhost", startPort, Seq()) - assert(boundPort1 === startPort + 1) - assert(boundPort2 === startPort + 2) + // Allow some wiggle room in case ports on the machine are under contention + assert(boundPort1 > startPort && boundPort1 < startPort + 10) + assert(boundPort2 > boundPort1 && boundPort2 < boundPort1 + 10) } test("jetty binds to port 0 correctly") { diff --git a/ec2/spark_ec2.py b/ec2/spark_ec2.py index 4087c3bc2b..6127c10ced 100755 --- a/ec2/spark_ec2.py +++ b/ec2/spark_ec2.py @@ -178,7 +178,7 @@ def launch_cluster(conn, opts, cluster_name): master_group.authorize('tcp', 50030, 50030, '0.0.0.0/0') master_group.authorize('tcp', 50070, 50070, '0.0.0.0/0') master_group.authorize('tcp', 60070, 60070, '0.0.0.0/0') - master_group.authorize('tcp', 3030, 3030, '0.0.0.0/0') + master_group.authorize('tcp', 3030, 3035, '0.0.0.0/0') if opts.cluster_type == "mesos": master_group.authorize('tcp', 38090, 38090, '0.0.0.0/0') if opts.ganglia: |