From f0ce736fadbcb7642b6148ad740f4508cd7dcd4d Mon Sep 17 00:00:00 2001 From: Qiuzhuang Lian Date: Sat, 8 Feb 2014 12:59:48 -0800 Subject: 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 == Merge branch commits == commit 9c19ce63637eee9369edd235979288d3d9fc9105 Author: Qiuzhuang Lian 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 --- core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala | 1 + 1 file changed, 1 insertion(+) mode change 100644 => 100755 core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala (limited to 'core') 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 fbf2e0f30f..f4ee0e2343 --- 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() } -- cgit v1.2.3