aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorzhichao.li <zhichao.li@intel.com>2015-05-30 08:06:11 -0400
committerSean Owen <sowen@cloudera.com>2015-05-30 08:06:11 -0400
commit2b35c99c7e73d22e82aef90b675709ae7f8d3b4a (patch)
tree9dd1a82fd4d51f097c2453f99b78bb9b24bc8775 /core
parent9d8aadb72bbc86595e253fe30201cda6a8db877e (diff)
downloadspark-2b35c99c7e73d22e82aef90b675709ae7f8d3b4a.tar.gz
spark-2b35c99c7e73d22e82aef90b675709ae7f8d3b4a.tar.bz2
spark-2b35c99c7e73d22e82aef90b675709ae7f8d3b4a.zip
[SPARK-7717] [WEBUI] Only showing total memory and cores for alive workers
Author: zhichao.li <zhichao.li@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
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala13
1 files changed, 7 insertions, 6 deletions
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 756927682c..6a7c74020b 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>