Updated Branches: refs/heads/branch-0.9 ce179f6b6 -> 22e0a3b4b
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 (cherry picked from commit f0ce736fadbcb7642b6148ad740f4508cd7dcd4d) Signed-off-by: Patrick Wendell <pwend...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/22e0a3b4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/22e0a3b4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/22e0a3b4 Branch: refs/heads/branch-0.9 Commit: 22e0a3b4bf50ac83629ffd2460609d7b6ca748b2 Parents: ce179f6 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 13:00:07 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/22e0a3b4/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 312560d..36bb289 --- a/core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala +++ b/core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala @@ -314,6 +314,7 @@ private[spark] class Worker( override def postStop() { executors.values.foreach(_.kill()) + drivers.values.foreach(_.kill()) webUi.stop() metricsSystem.stop() }
