diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2012-10-07 00:17:59 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2012-10-07 00:17:59 -0700 |
| commit | eca570f66a3d93bc1745a9fcf8410ad0a9db3e64 (patch) | |
| tree | 52e8eb4addd243c8ecd30c1297c50ee54c4906ee /core/src/main | |
| parent | b2fc3dd902d12ab936cd0f51431868010e521e28 (diff) | |
| download | spark-eca570f66a3d93bc1745a9fcf8410ad0a9db3e64.tar.gz spark-eca570f66a3d93bc1745a9fcf8410ad0a9db3e64.tar.bz2 spark-eca570f66a3d93bc1745a9fcf8410ad0a9db3e64.zip | |
Removed the need to sleep in tests due to waiting for Akka to shut down
Diffstat (limited to 'core/src/main')
| -rw-r--r-- | core/src/main/scala/spark/SparkEnv.scala | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/core/src/main/scala/spark/SparkEnv.scala b/core/src/main/scala/spark/SparkEnv.scala index 46b1574a61..6a006e0697 100644 --- a/core/src/main/scala/spark/SparkEnv.scala +++ b/core/src/main/scala/spark/SparkEnv.scala @@ -44,11 +44,9 @@ class SparkEnv ( blockManager.stop() blockManager.master.stop() actorSystem.shutdown() - // Akka's awaitTermination doesn't actually wait until the port is unbound, so sleep a bit - Thread.sleep(100) + // Unfortunately Akka's awaitTermination doesn't actually wait for the Netty server to shut + // down, but let's call it anyway in case it gets fixed in a later release actorSystem.awaitTermination() - // Akka's awaitTermination doesn't actually wait until the port is unbound, so sleep a bit - Thread.sleep(100) } } |