Updated Branches: refs/heads/master 78050805b -> f0ce736fa
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.l...@gmail.com> == Merge branch commits == commit 9c19ce63637eee9369edd235979288d3d9fc9105 Author: Qiuzhuang Lian <qiuzhuang.l...@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 Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/f0ce736f Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/f0ce736f Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/f0ce736f Branch: refs/heads/master Commit: f0ce736fadbcb7642b6148ad740f4508cd7dcd4d Parents: 7805080 Author: Qiuzhuang Lian <qiuzhuang.l...@gmail.com> Authored: Sat Feb 8 12:59:48 2014 -0800 Committer: Patrick Wendell <pwend...@gmail.com> Committed: Sat Feb 8 12:59:48 2014 -0800 ---------------------------------------------------------------------- core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/f0ce736f/core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala ---------------------------------------------------------------------- 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 old mode 100644 new mode 100755 index fbf2e0f..f4ee0e2 --- 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() }
