aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Ousterhout <kayousterhout@gmail.com>2014-12-09 15:10:36 -0800
committerKay Ousterhout <kayousterhout@gmail.com>2014-12-09 15:10:51 -0800
commit5a3a3cc1739e4d5004bc7117bd6afadf3142ec9b (patch)
tree73ba7d18dc985de21b7e4b4bb9b75d5faf3725ec
parente68674200ad95ca88a8427f7b2253b97a03c4337 (diff)
downloadspark-5a3a3cc1739e4d5004bc7117bd6afadf3142ec9b.tar.gz
spark-5a3a3cc1739e4d5004bc7117bd6afadf3142ec9b.tar.bz2
spark-5a3a3cc1739e4d5004bc7117bd6afadf3142ec9b.zip
[SPARK-4765] Make GC time always shown in UI.
This commit removes the GC time for each task from the set of optional, additional metrics, and instead always shows it for each task. cc pwendell Author: Kay Ousterhout <kayousterhout@gmail.com> Closes #3622 from kayousterhout/gc_time and squashes the following commits: 15ac242 [Kay Ousterhout] Make TaskDetailsClassNames private[spark] e71d893 [Kay Ousterhout] [SPARK-4765] Make GC time always shown in UI. (cherry picked from commit 1f5110630c1abb13a357b463c805a39772923b82) Signed-off-by: Kay Ousterhout <kayousterhout@gmail.com>
-rw-r--r--core/src/main/resources/org/apache/spark/ui/static/webui.css2
-rw-r--r--core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala13
-rw-r--r--core/src/main/scala/org/apache/spark/ui/jobs/TaskDetailsClassNames.scala3
3 files changed, 5 insertions, 13 deletions
diff --git a/core/src/main/resources/org/apache/spark/ui/static/webui.css b/core/src/main/resources/org/apache/spark/ui/static/webui.css
index cdf85bfbf3..68c52ac09b 100644
--- a/core/src/main/resources/org/apache/spark/ui/static/webui.css
+++ b/core/src/main/resources/org/apache/spark/ui/static/webui.css
@@ -171,6 +171,6 @@ span.additional-metric-title {
/* Hide all additional metrics by default. This is done here rather than using JavaScript to
* avoid slow page loads for stage pages with large numbers (e.g., thousands) of tasks. */
-.scheduler_delay, .gc_time, .deserialization_time, .serialization_time, .getting_result_time {
+.scheduler_delay, .deserialization_time, .serialization_time, .getting_result_time {
display: none;
}
diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala b/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala
index bfa54f8492..09a936c223 100644
--- a/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala
+++ b/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala
@@ -134,13 +134,6 @@ private[ui] class StagePage(parent: StagesTab) extends WebUIPage("stage") {
</li>
<li>
<span data-toggle="tooltip"
- title={ToolTips.GC_TIME} data-placement="right">
- <input type="checkbox" name={TaskDetailsClassNames.GC_TIME}/>
- <span class="additional-metric-title">GC Time</span>
- </span>
- </li>
- <li>
- <span data-toggle="tooltip"
title={ToolTips.RESULT_SERIALIZATION_TIME} data-placement="right">
<input type="checkbox" name={TaskDetailsClassNames.RESULT_SERIALIZATION_TIME}/>
<span class="additional-metric-title">Result Serialization Time</span>
@@ -168,7 +161,7 @@ private[ui] class StagePage(parent: StagesTab) extends WebUIPage("stage") {
("Executor ID / Host", ""), ("Launch Time", ""), ("Duration", ""),
("Scheduler Delay", TaskDetailsClassNames.SCHEDULER_DELAY),
("Task Deserialization Time", TaskDetailsClassNames.TASK_DESERIALIZATION_TIME),
- ("GC Time", TaskDetailsClassNames.GC_TIME),
+ ("GC Time", ""),
("Result Serialization Time", TaskDetailsClassNames.RESULT_SERIALIZATION_TIME),
("Getting Result Time", TaskDetailsClassNames.GETTING_RESULT_TIME)) ++
{if (hasAccumulators) Seq(("Accumulators", "")) else Nil} ++
@@ -308,7 +301,7 @@ private[ui] class StagePage(parent: StagesTab) extends WebUIPage("stage") {
<tr class={TaskDetailsClassNames.TASK_DESERIALIZATION_TIME}>
{deserializationQuantiles}
</tr>
- <tr class={TaskDetailsClassNames.GC_TIME}>{gcQuantiles}</tr>,
+ <tr>{gcQuantiles}</tr>,
<tr class={TaskDetailsClassNames.RESULT_SERIALIZATION_TIME}>
{serializationQuantiles}
</tr>,
@@ -429,7 +422,7 @@ private[ui] class StagePage(parent: StagesTab) extends WebUIPage("stage") {
class={TaskDetailsClassNames.TASK_DESERIALIZATION_TIME}>
{UIUtils.formatDuration(taskDeserializationTime.toLong)}
</td>
- <td sorttable_customkey={gcTime.toString} class={TaskDetailsClassNames.GC_TIME}>
+ <td sorttable_customkey={gcTime.toString}>
{if (gcTime > 0) UIUtils.formatDuration(gcTime) else ""}
</td>
<td sorttable_customkey={serializationTime.toString}
diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/TaskDetailsClassNames.scala b/core/src/main/scala/org/apache/spark/ui/jobs/TaskDetailsClassNames.scala
index ca942c4051..2d13bb6ddd 100644
--- a/core/src/main/scala/org/apache/spark/ui/jobs/TaskDetailsClassNames.scala
+++ b/core/src/main/scala/org/apache/spark/ui/jobs/TaskDetailsClassNames.scala
@@ -24,9 +24,8 @@ package org.apache.spark.ui.jobs
* If new optional metrics are added here, they should also be added to the end of webui.css
* to have the style set to "display: none;" by default.
*/
-private object TaskDetailsClassNames {
+private[spark] object TaskDetailsClassNames {
val SCHEDULER_DELAY = "scheduler_delay"
- val GC_TIME = "gc_time"
val TASK_DESERIALIZATION_TIME = "deserialization_time"
val RESULT_SERIALIZATION_TIME = "serialization_time"
val GETTING_RESULT_TIME = "getting_result_time"