You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/01/23 04:37:56 UTC
git commit: Merge pull request #496 from pwendell/master
Updated Branches:
refs/heads/branch-0.9 828f7b46e -> 51960b88d
Merge pull request #496 from pwendell/master
Fix bug in worker clean-up in UI
Introduced in d5a96fec (/cc @aarondav).
This should be picked into 0.8 and 0.9 as well. The bug causes old (zombie) workers on a node to not disappear immediately from the UI when a new one registers.
(cherry picked from commit a1cd185122602c96fb8ae16c0b506702283bf6e2)
Signed-off-by: Patrick Wendell <pw...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/51960b88
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/51960b88
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/51960b88
Branch: refs/heads/branch-0.9
Commit: 51960b88dcb4b00623ae49d859f9690f42665713
Parents: 828f7b4
Author: Patrick Wendell <pw...@gmail.com>
Authored: Wed Jan 22 19:37:29 2014 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Wed Jan 22 19:37:50 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/51960b88/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
}