diff options
| author | Joshi <rekhajoshm@gmail.com> | 2015-06-25 20:21:34 +0900 |
|---|---|---|
| committer | Kousuke Saruta <sarutak@oss.nttdata.co.jp> | 2015-06-25 20:21:34 +0900 |
| commit | 085a7216bf5e6c2b4f297feca4af71a751e37975 (patch) | |
| tree | 9f2111622ec7ea3eceb95b5e6b189efeaaa97fc8 /core | |
| parent | c337844ed7f9b2cb7b217dc935183ef5e1096ca1 (diff) | |
| download | spark-085a7216bf5e6c2b4f297feca4af71a751e37975.tar.gz spark-085a7216bf5e6c2b4f297feca4af71a751e37975.tar.bz2 spark-085a7216bf5e6c2b4f297feca4af71a751e37975.zip | |
[SPARK-5768] [WEB UI] Fix for incorrect memory in Spark UI
Fix for incorrect memory in Spark UI as per SPARK-5768
Author: Joshi <rekhajoshm@gmail.com>
Author: Rekha Joshi <rekhajoshm@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
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/ui/ToolTips.scala | 4 | ||||
| -rw-r--r-- | core/src/main/scala/org/apache/spark/ui/exec/ExecutorsPage.scala | 2 |
2 files changed, 5 insertions, 1 deletions
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 063e2a1f8b..e2d25e3636 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." 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 b247e4cdc3..01cddda4c6 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> |