diff options
| author | Shixiong Zhu <shixiong@databricks.com> | 2016-01-22 22:14:47 -0800 |
|---|---|---|
| committer | Shixiong Zhu <shixiong@databricks.com> | 2016-01-22 22:14:47 -0800 |
| commit | ea5c38fe75e4dfa60e61c5b4f20b742b67cb49b2 (patch) | |
| tree | e7ff1d926c3b0c9c2d2dbd020fac9bef75deb01b /core | |
| parent | bc1babd63da4ee56e6d371eb24805a5d714e8295 (diff) | |
| download | spark-ea5c38fe75e4dfa60e61c5b4f20b742b67cb49b2.tar.gz spark-ea5c38fe75e4dfa60e61c5b4f20b742b67cb49b2.tar.bz2 spark-ea5c38fe75e4dfa60e61c5b4f20b742b67cb49b2.zip | |
[HOTFIX]Remove rpcEnv.awaitTermination to avoid dead-lock in some test
Looks rpcEnv.awaitTermination may block some tests forever. Just remove it and investigate the tests.
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/SparkEnv.scala | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/src/main/scala/org/apache/spark/SparkEnv.scala b/core/src/main/scala/org/apache/spark/SparkEnv.scala index 9461afdc54..12c7b2048a 100644 --- a/core/src/main/scala/org/apache/spark/SparkEnv.scala +++ b/core/src/main/scala/org/apache/spark/SparkEnv.scala @@ -91,7 +91,6 @@ class SparkEnv ( metricsSystem.stop() outputCommitCoordinator.stop() rpcEnv.shutdown() - rpcEnv.awaitTermination() // Note that blockTransferService is stopped by BlockManager since it is started by it. |