You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by an...@apache.org on 2015/05/07 21:29:21 UTC
spark git commit: [SPARK-7391] DAG visualization: auto expand if
linked from another viz
Repository: spark
Updated Branches:
refs/heads/master 4eecf550a -> f1216514b
[SPARK-7391] DAG visualization: auto expand if linked from another viz
This is an addition to #5729.
If you click into a stage from the DAG viz on the job page, you might expect to expand on the stage. However, once you get to the stage page, you actually have to expand the DAG viz there yourself.
This patch makes this happen automatically. It's a small UX improvement.
Author: Andrew Or <an...@databricks.com>
Closes #5958 from andrewor14/viz-auto-expand and squashes the following commits:
03cd157 [Andrew Or] Automatically expand DAG viz if from job page
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/f1216514
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/f1216514
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/f1216514
Branch: refs/heads/master
Commit: f1216514b830eadcdfff6fca044afd6ae1585800
Parents: 4eecf55
Author: Andrew Or <an...@databricks.com>
Authored: Thu May 7 12:29:18 2015 -0700
Committer: Andrew Or <an...@databricks.com>
Committed: Thu May 7 12:29:18 2015 -0700
----------------------------------------------------------------------
.../org/apache/spark/ui/static/spark-dag-viz.js | 4 ++--
core/src/main/scala/org/apache/spark/ui/UIUtils.scala | 10 +++++++++-
.../main/scala/org/apache/spark/ui/jobs/StagePage.scala | 12 ++++++++++++
3 files changed, 23 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/f1216514/core/src/main/resources/org/apache/spark/ui/static/spark-dag-viz.js
----------------------------------------------------------------------
diff --git a/core/src/main/resources/org/apache/spark/ui/static/spark-dag-viz.js b/core/src/main/resources/org/apache/spark/ui/static/spark-dag-viz.js
index 76eb2c4..cda27ca 100644
--- a/core/src/main/resources/org/apache/spark/ui/static/spark-dag-viz.js
+++ b/core/src/main/resources/org/apache/spark/ui/static/spark-dag-viz.js
@@ -178,8 +178,8 @@ function renderDagVizForJob(svgContainer) {
var stageId = metadata.attr("stage-id");
var containerId = VizConstants.graphPrefix + stageId;
// Link each graph to the corresponding stage page (TODO: handle stage attempts)
- var stageLink =
- "/stages/stage/?id=" + stageId.replace(VizConstants.stagePrefix, "") + "&attempt=0";
+ var stageLink = "/stages/stage/?id=" +
+ stageId.replace(VizConstants.stagePrefix, "") + "&attempt=0&expandDagViz=true";
var container = svgContainer
.append("a")
.attr("xlink:href", stageLink)
http://git-wip-us.apache.org/repos/asf/spark/blob/f1216514/core/src/main/scala/org/apache/spark/ui/UIUtils.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/ui/UIUtils.scala b/core/src/main/scala/org/apache/spark/ui/UIUtils.scala
index e2d03f8..97eed13 100644
--- a/core/src/main/scala/org/apache/spark/ui/UIUtils.scala
+++ b/core/src/main/scala/org/apache/spark/ui/UIUtils.scala
@@ -20,7 +20,7 @@ package org.apache.spark.ui
import java.text.SimpleDateFormat
import java.util.{Locale, Date}
-import scala.xml.{Node, Text}
+import scala.xml.{Node, Text, Unparsed}
import org.apache.spark.Logging
import org.apache.spark.ui.scope.RDDOperationGraph
@@ -371,4 +371,12 @@ private[spark] object UIUtils extends Logging {
</div>
</div>
}
+
+ /** Return a script element that automatically expands the DAG visualization on page load. */
+ def expandDagVizOnLoad(forJob: Boolean): Seq[Node] = {
+ <script type="text/javascript">
+ {Unparsed("$(document).ready(function() { toggleDagViz(" + forJob + ") });")}
+ </script>
+ }
+
}
http://git-wip-us.apache.org/repos/asf/spark/blob/f1216514/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala
----------------------------------------------------------------------
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 5793100..6c43058 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
@@ -44,6 +44,10 @@ private[ui] class StagePage(parent: StagesTab) extends WebUIPage("stage") {
val parameterAttempt = request.getParameter("attempt")
require(parameterAttempt != null && parameterAttempt.nonEmpty, "Missing attempt parameter")
+ // If this is set, expand the dag visualization by default
+ val expandDagVizParam = request.getParameter("expandDagViz")
+ val expandDagViz = expandDagVizParam != null && expandDagVizParam.toBoolean
+
val stageId = parameterId.toInt
val stageAttemptId = parameterAttempt.toInt
val stageDataOption = progressListener.stageIdToData.get((stageId, stageAttemptId))
@@ -174,6 +178,13 @@ private[ui] class StagePage(parent: StagesTab) extends WebUIPage("stage") {
val dagViz = UIUtils.showDagVizForStage(
stageId, operationGraphListener.getOperationGraphForStage(stageId))
+ val maybeExpandDagViz: Seq[Node] =
+ if (expandDagViz) {
+ UIUtils.expandDagVizOnLoad(forJob = false)
+ } else {
+ Seq.empty
+ }
+
val accumulableHeaders: Seq[String] = Seq("Accumulable", "Value")
def accumulableRow(acc: AccumulableInfo): Elem =
<tr><td>{acc.name}</td><td>{acc.value}</td></tr>
@@ -440,6 +451,7 @@ private[ui] class StagePage(parent: StagesTab) extends WebUIPage("stage") {
summary ++
showAdditionalMetrics ++
dagViz ++
+ maybeExpandDagViz ++
<h4>Summary Metrics for {numCompleted} Completed Tasks</h4> ++
<div>{summaryTable.getOrElse("No tasks have reported metrics yet.")}</div> ++
<h4>Aggregated Metrics by Executor</h4> ++ executorTable.toNodeSeq ++
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org