spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pwend...@apache.org
Subject git commit: Merge pull request #496 from pwendell/master
Date Thu, 23 Jan 2014 03:38:20 GMT
Updated Branches:
  refs/heads/branch-0.8 5c443ad8c -> f3cc3a7b8


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 <pwendell@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/f3cc3a7b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/f3cc3a7b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/f3cc3a7b

Branch: refs/heads/branch-0.8
Commit: f3cc3a7b80f275283b6e4b43bc7346372926310b
Parents: 5c443ad
Author: Patrick Wendell <pwendell@gmail.com>
Authored: Wed Jan 22 19:37:29 2014 -0800
Committer: Patrick Wendell <pwendell@gmail.com>
Committed: Wed Jan 22 19:38:02 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/f3cc3a7b/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 cd91667..2b537c9 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
@@ -409,7 +409,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
     }


Mime
View raw message