Repository: spark Updated Branches: refs/heads/master 390b22fad -> 135a2ce5b
[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 <[email protected]> Closes #9101 from tgravescs/SPARK-10619. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/135a2ce5 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/135a2ce5 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/135a2ce5 Branch: refs/heads/master Commit: 135a2ce5b0b927b512c832d61c25e7b9d57e30be Parents: 390b22f Author: Tom Graves <[email protected]> Authored: Wed Oct 14 10:12:25 2015 -0700 Committer: Reynold Xin <[email protected]> Committed: Wed Oct 14 10:12:25 2015 -0700 ---------------------------------------------------------------------- core/src/main/scala/org/apache/spark/ui/UIUtils.scala | 1 + core/src/main/scala/org/apache/spark/ui/exec/ExecutorsPage.scala | 2 +- core/src/main/scala/org/apache/spark/ui/jobs/ExecutorTable.scala | 2 +- .../src/main/scala/org/apache/spark/streaming/ui/BatchPage.scala | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/135a2ce5/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 21dc8f0..68a9f91 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]() { http://git-wip-us.apache.org/repos/asf/spark/blob/135a2ce5/core/src/main/scala/org/apache/spark/ui/exec/ExecutorsPage.scala ---------------------------------------------------------------------- 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 01cddda..1a29b0f 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> http://git-wip-us.apache.org/repos/asf/spark/blob/135a2ce5/core/src/main/scala/org/apache/spark/ui/jobs/ExecutorTable.scala ---------------------------------------------------------------------- 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 d5cdbfa..be144f6 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> http://git-wip-us.apache.org/repos/asf/spark/blob/135a2ce5/streaming/src/main/scala/org/apache/spark/streaming/ui/BatchPage.scala ---------------------------------------------------------------------- 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 1b717b6..a19b85a 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> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
