Updated Branches:
  refs/heads/master 034dce2a7 -> a1cd18512

Fix bug in worker clean-up in UI

Introduced in d5a96fec. This should be picked into 0.8 and 0.9 as well.


Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/62855131
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/62855131
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/62855131

Branch: refs/heads/master
Commit: 6285513147c78b6bedc9ea21e6f4644b1a71e8f4
Parents: 5316bca
Author: Patrick Wendell <pwend...@gmail.com>
Authored: Wed Jan 22 18:19:46 2014 -0800
Committer: Patrick Wendell <pwend...@gmail.com>
Committed: Wed Jan 22 18:19:52 2014 -0800

----------------------------------------------------------------------
 core/src/main/scala/org/apache/spark/deploy/master/Master.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/62855131/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 d9ea96a..7be7749 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
@@ -515,7 +515,7 @@ private[spark] class Master(host: String, port: Int, 
webUiPort: Int) extends Act
     // There may be one or more refs to dead workers on this same node (w/ 
different ID's),
     // remove them.
     workers.filter { w =>
-      (w.host == host && w.port == port) && (w.state == WorkerState.DEAD)
+      (w.host == worker.host && w.port == worker.port) && (w.state == 
WorkerState.DEAD)
     }.foreach { w =>
       workers -= w
     }

Reply via email to