diff options
| author | Qiuzhuang Lian <Qiuzhuang.Lian@gmail.com> | 2014-02-08 12:59:48 -0800 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-02-08 12:59:48 -0800 |
| commit | f0ce736fadbcb7642b6148ad740f4508cd7dcd4d (patch) | |
| tree | c2593af19f9354b8cc669bcfa18d5b60e64864ce /core | |
| parent | 78050805bc691a00788f6e51f23dd785ca25b227 (diff) | |
| download | spark-f0ce736fadbcb7642b6148ad740f4508cd7dcd4d.tar.gz spark-f0ce736fadbcb7642b6148ad740f4508cd7dcd4d.tar.bz2 spark-f0ce736fadbcb7642b6148ad740f4508cd7dcd4d.zip | |
Merge pull request #561 from Qiuzhuang/master. Closes #561.
Kill drivers in postStop() for Worker.
JIRA SPARK-1068:https://spark-project.atlassian.net/browse/SPARK-1068
Author: Qiuzhuang Lian <Qiuzhuang.Lian@gmail.com>
== Merge branch commits ==
commit 9c19ce63637eee9369edd235979288d3d9fc9105
Author: Qiuzhuang Lian <Qiuzhuang.Lian@gmail.com>
Date: Sat Feb 8 16:07:39 2014 +0800
Kill drivers in postStop() for Worker.
JIRA SPARK-1068:https://spark-project.atlassian.net/browse/SPARK-1068
Diffstat (limited to 'core')
| -rwxr-xr-x[-rw-r--r--] | core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala b/core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala index fbf2e0f30f..f4ee0e2343 100644..100755 --- a/core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala +++ b/core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala @@ -325,6 +325,7 @@ private[spark] class Worker( override def postStop() { executors.values.foreach(_.kill()) + drivers.values.foreach(_.kill()) webUi.stop() metricsSystem.stop() } |