Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SPARK-1171: when executor is removed, we should minus totalCores instead of just freeCores on that executor #63

Closed
wants to merge 5 commits into from
Closed

SPARK-1171: when executor is removed, we should minus totalCores instead of just freeCores on that executor #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0c0e409
simplify the implementation of CoarseGrainedSchedulerBackend
CodingCat Mar 3, 2014
af470d3
style fix
CodingCat Mar 3, 2014
43c13e9
keep WorkerOffer immutable
CodingCat Mar 4, 2014
19c2bb4
use copy idiom to reconstruct the workerOffers
CodingCat Mar 4, 2014
f6bf93f
code clean
CodingCat Mar 4, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/main/scala/org/apache/spark/scheduler/WorkerOffer.scala
View file
Open in desktop
Expand Up @@ -21,4 +21,4 @@ package org.apache.spark.scheduler
* Represents free resources available on an executor. * Represents free resources available on an executor.
*/ */
private[spark] private[spark]
class WorkerOffer(val executorId: String, val host: String, val cores: Int) case class WorkerOffer(executorId: String, host: String, cores: Int)
8 changes: 6 additions & 2 deletions core/src/main/scala/org/apache/spark/scheduler/cluster/CoarseGrainedSchedulerBackend.scala
View file
Open in desktop
Expand Up @@ -54,6 +54,7 @@ class CoarseGrainedSchedulerBackend(scheduler: TaskSchedulerImpl, actorSystem: A
private val executorAddress = new HashMap[String, Address] private val executorAddress = new HashMap[String, Address]
private val executorHost = new HashMap[String, String] private val executorHost = new HashMap[String, String]
private val freeCores = new HashMap[String, Int] private val freeCores = new HashMap[String, Int]
private val totalCores = new HashMap[String, Int]
private val addressToExecutorId = new HashMap[Address, String] private val addressToExecutorId = new HashMap[Address, String]


override def preStart() { override def preStart() {
Expand All @@ -76,6 +77,7 @@ class CoarseGrainedSchedulerBackend(scheduler: TaskSchedulerImpl, actorSystem: A
sender ! RegisteredExecutor(sparkProperties) sender ! RegisteredExecutor(sparkProperties)
executorActor(executorId) = sender executorActor(executorId) = sender
executorHost(executorId) = Utils.parseHostPort(hostPort)._1 executorHost(executorId) = Utils.parseHostPort(hostPort)._1
totalCores(executorId) = cores
freeCores(executorId) = cores freeCores(executorId) = cores
executorAddress(executorId) = sender.path.address executorAddress(executorId) = sender.path.address
addressToExecutorId(sender.path.address) = executorId addressToExecutorId(sender.path.address) = executorId
Expand Down Expand Up @@ -147,10 +149,12 @@ class CoarseGrainedSchedulerBackend(scheduler: TaskSchedulerImpl, actorSystem: A
def removeExecutor(executorId: String, reason: String) { def removeExecutor(executorId: String, reason: String) {
if (executorActor.contains(executorId)) { if (executorActor.contains(executorId)) {
logInfo("Executor " + executorId + " disconnected, so removing it") logInfo("Executor " + executorId + " disconnected, so removing it")
val numCores = freeCores(executorId) val numCores = totalCores(executorId)
addressToExecutorId -= executorAddress(executorId)
executorActor -= executorId executorActor -= executorId
executorHost -= executorId executorHost -= executorId
addressToExecutorId -= executorAddress(executorId)
executorAddress -= executorId
totalCores -= executorId
freeCores -= executorId freeCores -= executorId
totalCoreCount.addAndGet(-numCores) totalCoreCount.addAndGet(-numCores)
scheduler.executorLost(executorId, SlaveLost(reason)) scheduler.executorLost(executorId, SlaveLost(reason))
Expand Down