diff options
author | Ankur Dave <ankurdave@gmail.com> | 2013-09-19 22:05:23 -0700 |
---|---|---|
committer | Ankur Dave <ankurdave@gmail.com> | 2013-09-19 22:05:23 -0700 |
commit | 026dba6abaaf6314a79ce873bb38b73a9b7fd1a7 (patch) | |
tree | 5a851e2f1ae8976eda78e02dc72f3a18412c73b8 | |
parent | cd7222c3dd2211ce790fa52110db911b862bb63b (diff) | |
download | spark-026dba6abaaf6314a79ce873bb38b73a9b7fd1a7.tar.gz spark-026dba6abaaf6314a79ce873bb38b73a9b7fd1a7.tar.bz2 spark-026dba6abaaf6314a79ce873bb38b73a9b7fd1a7.zip |
After unit tests, clear port properties unconditionally
In MapOutputTrackerSuite, the "remote fetch" test sets spark.driver.port
and spark.hostPort, assuming that they will be cleared by
LocalSparkContext. However, the test never sets sc, so it remains null,
causing LocalSparkContext to skip clearing these properties. Subsequent
tests therefore fail with java.net.BindException: "Address already in
use".
This commit makes LocalSparkContext clear the properties even if sc is
null.
-rw-r--r-- | core/src/test/scala/org/apache/spark/LocalSparkContext.scala | 10 | ||||
-rw-r--r-- | core/src/test/scala/org/apache/spark/SharedSparkContext.scala | 6 |
2 files changed, 7 insertions, 9 deletions
diff --git a/core/src/test/scala/org/apache/spark/LocalSparkContext.scala b/core/src/test/scala/org/apache/spark/LocalSparkContext.scala index 6ec124da9c..459e257d79 100644 --- a/core/src/test/scala/org/apache/spark/LocalSparkContext.scala +++ b/core/src/test/scala/org/apache/spark/LocalSparkContext.scala @@ -40,17 +40,17 @@ trait LocalSparkContext extends BeforeAndAfterEach with BeforeAndAfterAll { self } def resetSparkContext() = { - if (sc != null) { - LocalSparkContext.stop(sc) - sc = null - } + LocalSparkContext.stop(sc) + sc = null } } object LocalSparkContext { def stop(sc: SparkContext) { - sc.stop() + if (sc != null) { + sc.stop() + } // To avoid Akka rebinding to the same port, since it doesn't unbind immediately on shutdown System.clearProperty("spark.driver.port") System.clearProperty("spark.hostPort") diff --git a/core/src/test/scala/org/apache/spark/SharedSparkContext.scala b/core/src/test/scala/org/apache/spark/SharedSparkContext.scala index 97cbca09bf..288aa14eeb 100644 --- a/core/src/test/scala/org/apache/spark/SharedSparkContext.scala +++ b/core/src/test/scala/org/apache/spark/SharedSparkContext.scala @@ -33,10 +33,8 @@ trait SharedSparkContext extends BeforeAndAfterAll { self: Suite => } override def afterAll() { - if (_sc != null) { - LocalSparkContext.stop(_sc) - _sc = null - } + LocalSparkContext.stop(_sc) + _sc = null super.afterAll() } } |