Skip to content

[SPARK-23394][UI] In RDD storage page show the executor addresses instead of the IDs #20589

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

[SPARK-23394][UI] In RDD storage page show the executor addresses instead of the IDs #20589

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3ccad53
initial version
attilapiros Feb 12, 2018
ec160aa
sorting and checkstyle
attilapiros Feb 13, 2018
eee987a
revert
attilapiros Feb 13, 2018
ef69450
loading only live executors
attilapiros Feb 13, 2018
cdc5168
Merge branch 'master' into SPARK-23394
attilapiros Feb 13, 2018
75bb8c5
Sorting by address
attilapiros Feb 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions core/src/main/scala/org/apache/spark/ui/storage/RDDPage.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import javax.servlet.http.HttpServletRequest
import scala.xml.{Node, Unparsed}

import org.apache.spark.status.AppStatusStore
import org.apache.spark.status.api.v1.{RDDDataDistribution, RDDPartitionInfo}
import org.apache.spark.status.api.v1.{ExecutorSummary, RDDDataDistribution, RDDPartitionInfo}
import org.apache.spark.ui._
import org.apache.spark.util.Utils

Expand Down Expand Up @@ -76,7 +76,8 @@ private[ui] class RDDPage(parent: SparkUITab, store: AppStatusStore) extends Web
rddStorageInfo.partitions.get,
blockPageSize,
blockSortColumn,
blockSortDesc)
blockSortDesc,
store.executorList(true))
_blockTable.table(page)
} catch {
case e @ (_ : IllegalArgumentException | _ : IndexOutOfBoundsException) =>
Expand Down Expand Up @@ -182,7 +183,8 @@ private[ui] class BlockDataSource(
rddPartitions: Seq[RDDPartitionInfo],
pageSize: Int,
sortColumn: String,
desc: Boolean) extends PagedDataSource[BlockTableRowData](pageSize) {
desc: Boolean,
executorIdToAddress: Map[String, String]) extends PagedDataSource[BlockTableRowData](pageSize) {

private val data = rddPartitions.map(blockRow).sorted(ordering(sortColumn, desc))

Expand All @@ -198,7 +200,10 @@ private[ui] class BlockDataSource(
rddPartition.storageLevel,
rddPartition.memoryUsed,
rddPartition.diskUsed,
rddPartition.executors.mkString(" "))
rddPartition.executors
.map { id => executorIdToAddress.get(id).getOrElse(id) }
.sorted
.mkString(" "))
}

/**
Expand Down Expand Up @@ -226,7 +231,8 @@ private[ui] class BlockPagedTable(
rddPartitions: Seq[RDDPartitionInfo],
pageSize: Int,
sortColumn: String,
desc: Boolean) extends PagedTable[BlockTableRowData] {
desc: Boolean,
executorSummaries: Seq[ExecutorSummary]) extends PagedTable[BlockTableRowData] {

override def tableId: String = "rdd-storage-by-block-table"

Expand All @@ -243,7 +249,8 @@ private[ui] class BlockPagedTable(
rddPartitions,
pageSize,
sortColumn,
desc)
desc,
executorSummaries.map { ex => (ex.id, ex.hostPort) }.toMap)

override def pageLink(page: Int): String = {
val encodedSortColumn = URLEncoder.encode(sortColumn, "UTF-8")
Expand Down