Repository: spark Updated Branches: refs/heads/branch-1.2 e1d839e96 -> 7ecf30e35
[SPARK-4750] Dynamic allocation - synchronize kills Simple omission on my part. Author: Andrew Or <and...@databricks.com> Closes #3612 from andrewor14/dynamic-allocation-synchronization and squashes the following commits: 1f03b60 [Andrew Or] Synchronize kills (cherry picked from commit 65f929d5b3a50a73cd6397bd4b72c3e7d94c99d7) Signed-off-by: Josh Rosen <joshro...@databricks.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/7ecf30e3 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/7ecf30e3 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/7ecf30e3 Branch: refs/heads/branch-1.2 Commit: 7ecf30e35a893dc2a34d92e9c03d0a0f3c30f39a Parents: e1d839e Author: Andrew Or <and...@databricks.com> Authored: Mon Dec 8 16:02:33 2014 -0800 Committer: Josh Rosen <joshro...@databricks.com> Committed: Wed Dec 17 12:11:53 2014 -0800 ---------------------------------------------------------------------- .../spark/scheduler/cluster/CoarseGrainedSchedulerBackend.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/7ecf30e3/core/src/main/scala/org/apache/spark/scheduler/cluster/CoarseGrainedSchedulerBackend.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/scheduler/cluster/CoarseGrainedSchedulerBackend.scala b/core/src/main/scala/org/apache/spark/scheduler/cluster/CoarseGrainedSchedulerBackend.scala index 88b196a..29cd344 100644 --- a/core/src/main/scala/org/apache/spark/scheduler/cluster/CoarseGrainedSchedulerBackend.scala +++ b/core/src/main/scala/org/apache/spark/scheduler/cluster/CoarseGrainedSchedulerBackend.scala @@ -334,7 +334,7 @@ class CoarseGrainedSchedulerBackend(scheduler: TaskSchedulerImpl, val actorSyste * Request that the cluster manager kill the specified executors. * Return whether the kill request is acknowledged. */ - final def killExecutors(executorIds: Seq[String]): Boolean = { + final def killExecutors(executorIds: Seq[String]): Boolean = synchronized { logInfo(s"Requesting to kill executor(s) ${executorIds.mkString(", ")}") val filteredExecutorIds = new ArrayBuffer[String] executorIds.foreach { id => --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
