diff options
| author | Tom Graves <tgraves@yahoo-inc.com> | 2015-10-14 10:12:25 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@databricks.com> | 2015-10-14 10:12:25 -0700 |
| commit | 135a2ce5b0b927b512c832d61c25e7b9d57e30be (patch) | |
| tree | 5aecc1bc8a1bc4e201cb19494822abec295fa972 | |
| parent | 390b22fad69a33eb6daee25b6b858a2e768670a5 (diff) | |
| download | spark-135a2ce5b0b927b512c832d61c25e7b9d57e30be.tar.gz spark-135a2ce5b0b927b512c832d61c25e7b9d57e30be.tar.bz2 spark-135a2ce5b0b927b512c832d61c25e7b9d57e30be.zip | |
[SPARK-10619] Can't sort columns on Executor Page
should pick into spark 1.5.2 also.
https://issues.apache.org/jira/browse/SPARK-10619
looks like this was broken by commit: https://github.com/apache/spark/commit/fb1d06fc242ec00320f1a3049673fbb03c4a6eb9#diff-b8adb646ef90f616c34eb5c98d1ebd16
It looks like somethings were change to use the UIUtils.listingTable but executor page wasn't converted so when it removed sortable from the UIUtils. TABLE_CLASS_NOT_STRIPED it broke this page.
Simply add the sortable tag back in and it fixes both active UI and the history server UI.
Author: Tom Graves <tgraves@yahoo-inc.com>
Closes #9101 from tgravescs/SPARK-10619.
4 files changed, 4 insertions, 3 deletions
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 21dc8f0b65..68a9f912a5 100644 --- a/core/src/main/scala/org/apache/spark/ui/UIUtils.scala +++ b/core/src/main/scala/org/apache/spark/ui/UIUtils.scala @@ -31,6 +31,7 @@ import org.apache.spark.ui.scope.RDDOperationGraph private[spark] object UIUtils extends Logging { val TABLE_CLASS_NOT_STRIPED = "table table-bordered table-condensed" val TABLE_CLASS_STRIPED = TABLE_CLASS_NOT_STRIPED + " table-striped" + val TABLE_CLASS_STRIPED_SORTABLE = TABLE_CLASS_STRIPED + " sortable" // SimpleDateFormat is not thread-safe. Don't expose it to avoid improper use. private val dateFormat = new ThreadLocal[SimpleDateFormat]() { 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 01cddda4c6..1a29b0f412 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 @@ -62,7 +62,7 @@ private[ui] class ExecutorsPage( val logsExist = execInfo.filter(_.executorLogs.nonEmpty).nonEmpty val execTable = - <table class={UIUtils.TABLE_CLASS_STRIPED}> + <table class={UIUtils.TABLE_CLASS_STRIPED_SORTABLE}> <thead> <th>Executor ID</th> <th>Address</th> 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 d5cdbfac10..be144f6065 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 @@ -50,7 +50,7 @@ private[ui] class ExecutorTable(stageId: Int, stageAttemptId: Int, parent: Stage hasBytesSpilled = data.hasBytesSpilled }) - <table class={UIUtils.TABLE_CLASS_STRIPED}> + <table class={UIUtils.TABLE_CLASS_STRIPED_SORTABLE}> <thead> <th>Executor ID</th> <th>Address</th> diff --git a/streaming/src/main/scala/org/apache/spark/streaming/ui/BatchPage.scala b/streaming/src/main/scala/org/apache/spark/streaming/ui/BatchPage.scala index 1b717b6454..a19b85a51d 100644 --- a/streaming/src/main/scala/org/apache/spark/streaming/ui/BatchPage.scala +++ b/streaming/src/main/scala/org/apache/spark/streaming/ui/BatchPage.scala @@ -443,7 +443,7 @@ private[ui] class BatchPage(parent: StreamingTab) extends WebUIPage("batch") { } def generateInputMetadataTable(inputMetadatas: Seq[(Int, String)]): Seq[Node] = { - <table class={SparkUIUtils.TABLE_CLASS_STRIPED}> + <table class={SparkUIUtils.TABLE_CLASS_STRIPED_SORTABLE}> <thead> <tr> <th>Input</th> |