Skip to content
Snippets Groups Projects
Commit 5f54bdf9 authored by Tathagata Das's avatar Tathagata Das
Browse files

Added shutdown for akka to SparkContext.stop(). Helps a little, but many testsuites still fail.

parent c6156da9
No related branches found
No related tags found
No related merge requests found
......@@ -260,6 +260,7 @@ class SparkContext(
// Stop the SparkContext
def stop() {
remote.shutdownServerModule()
dagScheduler.stop()
dagScheduler = null
taskScheduler = null
......
......@@ -334,14 +334,14 @@ class ConnectionManager(port: Int) extends Logging {
selectorThread.interrupt()
selectorThread.join()
selector.close()
val connections = connectionsByKey.values
connections.foreach(_.close())
if (connectionsByKey.size != 0) {
logWarning("All connections not cleaned up")
}
handleMessageExecutor.shutdown()
logInfo("ConnectionManager stopped")
}
val connections = connectionsByKey.values
connections.foreach(_.close())
if (connectionsByKey.size != 0) {
logWarning("All connections not cleaned up")
}
handleMessageExecutor.shutdown()
logInfo("ConnectionManager stopped")
}
}
......
......@@ -573,6 +573,7 @@ class BlockManager(maxMemory: Long, val serializer: Serializer) extends Logging
blockInfo.clear()
memoryStore.clear()
diskStore.clear()
logInfo("BlockManager stopped")
}
}
......
......@@ -352,7 +352,11 @@ object BlockManagerMaster extends Logging {
}
def stopBlockManagerMaster() {
if (masterActor != null) masterActor.stop()
if (masterActor != null) {
masterActor.stop()
masterActor = null
logInfo("BlockManagerMaster stopped")
}
}
def notifyADeadHost(host: String) {
......
......@@ -125,6 +125,7 @@ class MemoryStore(blockManager: BlockManager, maxMemory: Long)
memoryStore.clear()
}
blockDropper.shutdown()
logInfo("MemoryStore cleared")
}
private def drop(blockId: String) {
......
......@@ -4,4 +4,4 @@ if [ "$MESOS_HOME" != "" ]; then
EXTRA_ARGS="-Djava.library.path=$MESOS_HOME/lib/java"
fi
export SPARK_HOME=$(cd "$(dirname $0)/.."; pwd)
java -Xmx800M -XX:MaxPermSize=150m $EXTRA_ARGS -jar $SPARK_HOME/sbt/sbt-launch-*.jar "$@"
java -Xmx1200M -XX:MaxPermSize=200m $EXTRA_ARGS -jar $SPARK_HOME/sbt/sbt-launch-*.jar "$@"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment