diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2014-01-22 19:37:29 -0800 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-01-22 19:37:29 -0800 |
| commit | a1cd185122602c96fb8ae16c0b506702283bf6e2 (patch) | |
| tree | b4dcdd9ee581211f8c2c4cbd30f45c02503d21aa /core/src | |
| parent | 034dce2a7e0537836e15b9bfecc333b28fc76a6a (diff) | |
| parent | 6285513147c78b6bedc9ea21e6f4644b1a71e8f4 (diff) | |
| download | spark-a1cd185122602c96fb8ae16c0b506702283bf6e2.tar.gz spark-a1cd185122602c96fb8ae16c0b506702283bf6e2.tar.bz2 spark-a1cd185122602c96fb8ae16c0b506702283bf6e2.zip | |
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.
Diffstat (limited to 'core/src')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/deploy/master/Master.scala | 2 |
1 files changed, 1 insertions, 1 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 fe9770cec2..d49401f2fe 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 } |