diff options
| author | CodingCat <zhunansjtu@gmail.com> | 2014-02-05 22:08:47 -0800 |
|---|---|---|
| committer | Reynold Xin <rxin@apache.org> | 2014-02-05 22:08:47 -0800 |
| commit | 18c4ee71e27189f5f3f4eb6bfc6ad8860aa254c6 (patch) | |
| tree | 4c1f4743f36694d23cd125cc7e6ada942debd55d | |
| parent | cc14ba974c8e98c08548a2ccf64c2765f313f649 (diff) | |
| download | spark-18c4ee71e27189f5f3f4eb6bfc6ad8860aa254c6.tar.gz spark-18c4ee71e27189f5f3f4eb6bfc6ad8860aa254c6.tar.bz2 spark-18c4ee71e27189f5f3f4eb6bfc6ad8860aa254c6.zip | |
Merge pull request #549 from CodingCat/deadcode_master. Closes #549.
remove actorToWorker in master.scala, which is actually not used
actorToWorker is actually not used in the code....just remove it
Author: CodingCat <zhunansjtu@gmail.com>
== Merge branch commits ==
commit 52656c2d4bbf9abcd8bef65d454badb9cb14a32c
Author: CodingCat <zhunansjtu@gmail.com>
Date: Thu Feb 6 00:28:26 2014 -0500
remove actorToWorker in master.scala, which is actually not used
| -rw-r--r-- | core/src/main/scala/org/apache/spark/deploy/master/Master.scala | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/core/src/main/scala/org/apache/spark/deploy/master/Master.scala b/core/src/main/scala/org/apache/spark/deploy/master/Master.scala index 380055728f..2ef167ffc0 100644 --- a/core/src/main/scala/org/apache/spark/deploy/master/Master.scala +++ b/core/src/main/scala/org/apache/spark/deploy/master/Master.scala @@ -54,7 +54,6 @@ private[spark] class Master(host: String, port: Int, webUiPort: Int) extends Act val workers = new HashSet[WorkerInfo] val idToWorker = new HashMap[String, WorkerInfo] - val actorToWorker = new HashMap[ActorRef, WorkerInfo] val addressToWorker = new HashMap[Address, WorkerInfo] val apps = new HashSet[ApplicationInfo] @@ -534,7 +533,6 @@ private[spark] class Master(host: String, port: Int, webUiPort: Int) extends Act workers += worker idToWorker(worker.id) = worker - actorToWorker(worker.actor) = worker addressToWorker(workerAddress) = worker true } @@ -543,7 +541,6 @@ private[spark] class Master(host: String, port: Int, webUiPort: Int) extends Act logInfo("Removing worker " + worker.id + " on " + worker.host + ":" + worker.port) worker.setState(WorkerState.DEAD) idToWorker -= worker.id - actorToWorker -= worker.actor addressToWorker -= worker.actor.path.address for (exec <- worker.executors.values) { logInfo("Telling app of lost executor: " + exec.id) |