ODIn/spark-instrumented-optimizer
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #504 from mosharaf/master

Browse source 
Worker address was getting removed when removing an app.
This commit is contained in:
Matei Zaharia 2013-03-02 22:14:49 -08:00
parent 94b3db136d 4ab387bcdb
commit 6bfc7cad6b
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/main/scala/spark/deploy/master/Master.scala
View file

@ -263,7 +263,7 @@ private[spark] class Master(ip: String, port: Int, webUiPort: Int) extends Actor
apps -= app
idToApp -= app.id
actorToApp -= app.driver
addressToWorker -= app.driver.path.address
addressToApp -= app.driver.path.address
completedApps += app // Remember it in our history
waitingApps -= app
for (exec <- app.executors.values) {

2
core/src/main/scala/spark/storage/BlockManagerMaster.scala
View file

@ -26,7 +26,7 @@ private[spark] class BlockManagerMaster(
val AKKA_RETRY_ATTEMPTS: Int = System.getProperty("spark.akka.num.retries", "3").toInt
val AKKA_RETRY_INTERVAL_MS: Int = System.getProperty("spark.akka.retry.wait", "3000").toInt
val DRIVER_AKKA_ACTOR_NAME = "BlockMasterManager"
val DRIVER_AKKA_ACTOR_NAME = "BlockManagerMaster"
val timeout = 10.seconds
var driverActor: ActorRef = {