ODIn/spark-instrumented-optimizer
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #3 from ankurdave/clear-port-properties-after-tests

Browse source 
After unit tests, clear port properties unconditionally

Also submitted to Spark upstream (mesos/spark#940)
This commit is contained in:
Ankur Dave 2013-09-19 22:41:44 -07:00
parent 68ad33a127 3ebbcaf21c
commit 6a5e665cdc
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/src/test/scala/org/apache/spark/LocalSparkContext.scala
View file

@ -40,17 +40,17 @@ trait LocalSparkContext extends BeforeAndAfterEach with BeforeAndAfterAll { self
} }
def resetSparkContext() = { def resetSparkContext() = {
if (sc != null) { LocalSparkContext.stop(sc)
LocalSparkContext.stop(sc) sc = null
sc = null
}
} }
} }
object LocalSparkContext { object LocalSparkContext {
def stop(sc: SparkContext) { 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 // To avoid Akka rebinding to the same port, since it doesn't unbind immediately on shutdown
System.clearProperty("spark.driver.port") System.clearProperty("spark.driver.port")
System.clearProperty("spark.hostPort") System.clearProperty("spark.hostPort")

6
core/src/test/scala/org/apache/spark/SharedSparkContext.scala
View file

@ -33,10 +33,8 @@ trait SharedSparkContext extends BeforeAndAfterAll { self: Suite =>
} }
override def afterAll() { override def afterAll() {
if (_sc != null) { LocalSparkContext.stop(_sc)
LocalSparkContext.stop(_sc) _sc = null
_sc = null
}
super.afterAll() super.afterAll()
} }
} }