Repository: spark Updated Branches: refs/heads/master 9d8aadb72 -> 2b35c99c7
[SPARK-7717] [WEBUI] Only showing total memory and cores for alive workers Author: zhichao.li <zhichao...@intel.com> Closes #6317 from zhichao-li/workers and squashes the following commits: d68bf11 [zhichao.li] change prefix 99b6768 [zhichao.li] remove extra space and add 'Alive' prefix 1e8eb06 [zhichao.li] only showing alive workers Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/2b35c99c Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/2b35c99c Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/2b35c99c Branch: refs/heads/master Commit: 2b35c99c7e73d22e82aef90b675709ae7f8d3b4a Parents: 9d8aadb Author: zhichao.li <zhichao...@intel.com> Authored: Sat May 30 08:06:11 2015 -0400 Committer: Sean Owen <so...@cloudera.com> Committed: Sat May 30 08:06:11 2015 -0400 ---------------------------------------------------------------------- .../org/apache/spark/deploy/master/ui/MasterPage.scala | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/2b35c99c/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala b/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala index 7569276..6a7c740 100644 --- a/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala +++ b/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala @@ -75,6 +75,7 @@ private[ui] class MasterPage(parent: MasterWebUI) extends WebUIPage("") { val workerHeaders = Seq("Worker Id", "Address", "State", "Cores", "Memory") val workers = state.workers.sortBy(_.id) + val aliveWorkers = state.workers.filter(_.state == WorkerState.ALIVE) val workerTable = UIUtils.listingTable(workerHeaders, workerRow, workers) val appHeaders = Seq("Application ID", "Name", "Cores", "Memory per Node", "Submitted Time", @@ -108,12 +109,12 @@ private[ui] class MasterPage(parent: MasterWebUI) extends WebUIPage("") { </li> }.getOrElse { Seq.empty } } - <li><strong>Workers:</strong> {state.workers.size}</li> - <li><strong>Cores:</strong> {state.workers.map(_.cores).sum} Total, - {state.workers.map(_.coresUsed).sum} Used</li> - <li><strong>Memory:</strong> - {Utils.megabytesToString(state.workers.map(_.memory).sum)} Total, - {Utils.megabytesToString(state.workers.map(_.memoryUsed).sum)} Used</li> + <li><strong>Alive Workers:</strong> {aliveWorkers.size}</li> + <li><strong>Cores in use:</strong> {aliveWorkers.map(_.cores).sum} Total, + {aliveWorkers.map(_.coresUsed).sum} Used</li> + <li><strong>Memory in use:</strong> + {Utils.megabytesToString(aliveWorkers.map(_.memory).sum)} Total, + {Utils.megabytesToString(aliveWorkers.map(_.memoryUsed).sum)} Used</li> <li><strong>Applications:</strong> {state.activeApps.size} Running, {state.completedApps.size} Completed </li> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org