You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2014/02/06 07:08:51 UTC
git commit: Merge pull request #549 from CodingCat/deadcode_master.
Closes #549.
Updated Branches:
refs/heads/master cc14ba974 -> 18c4ee71e
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 <zh...@gmail.com>
== Merge branch commits ==
commit 52656c2d4bbf9abcd8bef65d454badb9cb14a32c
Author: CodingCat <zh...@gmail.com>
Date: Thu Feb 6 00:28:26 2014 -0500
remove actorToWorker in master.scala, which is actually not used
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/18c4ee71
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/18c4ee71
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/18c4ee71
Branch: refs/heads/master
Commit: 18c4ee71e27189f5f3f4eb6bfc6ad8860aa254c6
Parents: cc14ba9
Author: CodingCat <zh...@gmail.com>
Authored: Wed Feb 5 22:08:47 2014 -0800
Committer: Reynold Xin <rx...@apache.org>
Committed: Wed Feb 5 22:08:47 2014 -0800
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/deploy/master/Master.scala | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/18c4ee71/core/src/main/scala/org/apache/spark/deploy/master/Master.scala
----------------------------------------------------------------------
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 3800557..2ef167f 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)