diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-03-02 22:14:49 -0800 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-03-02 22:14:49 -0800 |
| commit | 6bfc7cad6bf58aa40975c0984b98debb33df080d (patch) | |
| tree | 1587d894fa68c8826530887a12a48713df4bf159 /core | |
| parent | 94b3db136d557bd1501b0d440b51e143369c77c4 (diff) | |
| parent | 4ab387bcdbfb895438de97b13859450e9e54b878 (diff) | |
| download | spark-6bfc7cad6bf58aa40975c0984b98debb33df080d.tar.gz spark-6bfc7cad6bf58aa40975c0984b98debb33df080d.tar.bz2 spark-6bfc7cad6bf58aa40975c0984b98debb33df080d.zip | |
Merge pull request #504 from mosharaf/master
Worker address was getting removed when removing an app.
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/spark/deploy/master/Master.scala | 2 | ||||
| -rw-r--r-- | core/src/main/scala/spark/storage/BlockManagerMaster.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/src/main/scala/spark/deploy/master/Master.scala b/core/src/main/scala/spark/deploy/master/Master.scala index d5188a4779..4af22cf9b6 100644 --- a/core/src/main/scala/spark/deploy/master/Master.scala +++ b/core/src/main/scala/spark/deploy/master/Master.scala @@ -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) { diff --git a/core/src/main/scala/spark/storage/BlockManagerMaster.scala b/core/src/main/scala/spark/storage/BlockManagerMaster.scala index 7389bee150..d93cfc48d0 100644 --- a/core/src/main/scala/spark/storage/BlockManagerMaster.scala +++ b/core/src/main/scala/spark/storage/BlockManagerMaster.scala @@ -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 = { |