aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorMatei Zaharia <matei@eecs.berkeley.edu>2012-09-12 14:50:37 -0700
committerMatei Zaharia <matei@eecs.berkeley.edu>2012-09-12 14:50:37 -0700
commit9199775d41671b951ff76c599fe24d04b6633f5c (patch)
treeb8cffcabbe14c487de9cfa47b7193772e443d8ad /core
parentd5bdd1235341109666ebac6ee70fd14383d8c86e (diff)
downloadspark-9199775d41671b951ff76c599fe24d04b6633f5c.tar.gz
spark-9199775d41671b951ff76c599fe24d04b6633f5c.tar.bz2
spark-9199775d41671b951ff76c599fe24d04b6633f5c.zip
Wait for Akka to really shut down in SparkEnv.stop()
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/spark/SparkEnv.scala4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/src/main/scala/spark/SparkEnv.scala b/core/src/main/scala/spark/SparkEnv.scala
index a95d1bc8ea..b9efdbde64 100644
--- a/core/src/main/scala/spark/SparkEnv.scala
+++ b/core/src/main/scala/spark/SparkEnv.scala
@@ -1,6 +1,8 @@
package spark
import akka.actor.ActorSystem
+import akka.actor.ActorSystemImpl
+import akka.remote.RemoteActorRefProvider
import spark.broadcast.BroadcastManager
import spark.storage.BlockManager
@@ -39,6 +41,8 @@ class SparkEnv (
blockManager.master.stop()
actorSystem.shutdown()
actorSystem.awaitTermination()
+ // Akka's awaitTermination doesn't actually wait until the port is unbound, so sleep a bit
+ Thread.sleep(100)
}
}