You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sa...@apache.org on 2015/06/25 13:21:52 UTC
spark git commit: [SPARK-5768] [WEB UI] Fix for incorrect memory in
Spark UI
Repository: spark
Updated Branches:
refs/heads/master c337844ed -> 085a7216b
[SPARK-5768] [WEB UI] Fix for incorrect memory in Spark UI
Fix for incorrect memory in Spark UI as per SPARK-5768
Author: Joshi <re...@gmail.com>
Author: Rekha Joshi <re...@gmail.com>
Closes #6972 from rekhajoshm/SPARK-5768 and squashes the following commits:
b678a91 [Joshi] Fix for incorrect memory in Spark UI
2fe53d9 [Joshi] Fix for incorrect memory in Spark UI
eb823b8 [Joshi] SPARK-5768: Fix for incorrect memory in Spark UI
0be142d [Rekha Joshi] Merge pull request #3 from apache/master
106fd8e [Rekha Joshi] Merge pull request #2 from apache/master
e3677c9 [Rekha Joshi] Merge pull request #1 from apache/master
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/085a7216
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/085a7216
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/085a7216
Branch: refs/heads/master
Commit: 085a7216bf5e6c2b4f297feca4af71a751e37975
Parents: c337844
Author: Joshi <re...@gmail.com>
Authored: Thu Jun 25 20:21:34 2015 +0900
Committer: Kousuke Saruta <sa...@oss.nttdata.co.jp>
Committed: Thu Jun 25 20:21:34 2015 +0900
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/ui/ToolTips.scala | 4 ++++
core/src/main/scala/org/apache/spark/ui/exec/ExecutorsPage.scala | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/085a7216/core/src/main/scala/org/apache/spark/ui/ToolTips.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/ui/ToolTips.scala b/core/src/main/scala/org/apache/spark/ui/ToolTips.scala
index 063e2a1..e2d25e3 100644
--- a/core/src/main/scala/org/apache/spark/ui/ToolTips.scala
+++ b/core/src/main/scala/org/apache/spark/ui/ToolTips.scala
@@ -35,6 +35,10 @@ private[spark] object ToolTips {
val OUTPUT = "Bytes and records written to Hadoop."
+ val STORAGE_MEMORY =
+ "Memory used / total available memory for storage of data " +
+ "like RDD partitions cached in memory. "
+
val SHUFFLE_WRITE =
"Bytes and records written to disk in order to be read by a shuffle in a future stage."
http://git-wip-us.apache.org/repos/asf/spark/blob/085a7216/core/src/main/scala/org/apache/spark/ui/exec/ExecutorsPage.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/ui/exec/ExecutorsPage.scala b/core/src/main/scala/org/apache/spark/ui/exec/ExecutorsPage.scala
index b247e4c..01cddda 100644
--- a/core/src/main/scala/org/apache/spark/ui/exec/ExecutorsPage.scala
+++ b/core/src/main/scala/org/apache/spark/ui/exec/ExecutorsPage.scala
@@ -67,7 +67,7 @@ private[ui] class ExecutorsPage(
<th>Executor ID</th>
<th>Address</th>
<th>RDD Blocks</th>
- <th>Memory Used</th>
+ <th><span data-toggle="tooltip" title={ToolTips.STORAGE_MEMORY}>Storage Memory</span></th>
<th>Disk Used</th>
<th>Active Tasks</th>
<th>Failed Tasks</th>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org