diff options
| author | Jean-Baptiste Onofré <jbonofre@apache.org> | 2015-11-18 08:57:58 +0000 |
|---|---|---|
| committer | Sean Owen <sowen@cloudera.com> | 2015-11-18 08:57:58 +0000 |
| commit | e62820c85fe02c70f9ed51b2e68d41ff8cfecd40 (patch) | |
| tree | e700ac2ebd0b30291766b32f43cc1d73ab7d2265 | |
| parent | b8f4379ba1c5c1a8f3b4c88bd97031dc8ad2dfea (diff) | |
| download | spark-e62820c85fe02c70f9ed51b2e68d41ff8cfecd40.tar.gz spark-e62820c85fe02c70f9ed51b2e68d41ff8cfecd40.tar.bz2 spark-e62820c85fe02c70f9ed51b2e68d41ff8cfecd40.zip | |
[SPARK-6541] Sort executors by ID (numeric)
"Force" the executor ID sort with Int.
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Closes #9165 from jbonofre/SPARK-6541.
| -rw-r--r-- | core/src/main/resources/org/apache/spark/ui/static/sorttable.js | 2 | ||||
| -rw-r--r-- | core/src/main/scala/org/apache/spark/ui/jobs/ExecutorTable.scala | 13 |
2 files changed, 12 insertions, 3 deletions
diff --git a/core/src/main/resources/org/apache/spark/ui/static/sorttable.js b/core/src/main/resources/org/apache/spark/ui/static/sorttable.js index dde6069000..a73d9a5cbc 100644 --- a/core/src/main/resources/org/apache/spark/ui/static/sorttable.js +++ b/core/src/main/resources/org/apache/spark/ui/static/sorttable.js @@ -89,7 +89,7 @@ sorttable = { // make it clickable to sort headrow[i].sorttable_columnindex = i; headrow[i].sorttable_tbody = table.tBodies[0]; - dean_addEvent(headrow[i],"click", function(e) { + dean_addEvent(headrow[i],"click", sorttable.innerSortFunction = function(e) { if (this.className.search(/\bsorttable_sorted\b/) != -1) { // if we're already sorted by this column, just diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/ExecutorTable.scala b/core/src/main/scala/org/apache/spark/ui/jobs/ExecutorTable.scala index be144f6065..1268f44596 100644 --- a/core/src/main/scala/org/apache/spark/ui/jobs/ExecutorTable.scala +++ b/core/src/main/scala/org/apache/spark/ui/jobs/ExecutorTable.scala @@ -18,7 +18,7 @@ package org.apache.spark.ui.jobs import scala.collection.mutable -import scala.xml.Node +import scala.xml.{Unparsed, Node} import org.apache.spark.ui.{ToolTips, UIUtils} import org.apache.spark.ui.jobs.UIData.StageUIData @@ -52,7 +52,7 @@ private[ui] class ExecutorTable(stageId: Int, stageAttemptId: Int, parent: Stage <table class={UIUtils.TABLE_CLASS_STRIPED_SORTABLE}> <thead> - <th>Executor ID</th> + <th id="executorid">Executor ID</th> <th>Address</th> <th>Task Time</th> <th>Total Tasks</th> @@ -89,6 +89,15 @@ private[ui] class ExecutorTable(stageId: Int, stageAttemptId: Int, parent: Stage {createExecutorTable()} </tbody> </table> + <script> + {Unparsed { + """ + | window.onload = function() { + | sorttable.innerSortFunction.apply(document.getElementById('executorid'), []) + | }; + """.stripMargin + }} + </script> } private def createExecutorTable() : Seq[Node] = { |