Skip to content

[SPARK-26363][WebUI] Avoid duplicated KV store lookups in method taskList #23310

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 4 commits into from
Closed

[SPARK-26363][WebUI] Avoid duplicated KV store lookups in method taskList #23310

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
908bafd
remove executorLogs in TaskData
gengliangwang Dec 13, 2018
e89040f
Revert "remove executorLogs in TaskData"
gengliangwang Dec 20, 2018
67992a5
use hash map to reduce kv store lookup
gengliangwang Dec 20, 2018
40582c1
remove unused code
gengliangwang Dec 20, 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
52 changes: 28 additions & 24 deletions core/src/main/scala/org/apache/spark/status/AppStatusStore.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ package org.apache.spark.status
import java.util.{List => JList}

import scala.collection.JavaConverters._
import scala.collection.mutable.HashMap

import org.apache.spark.{JobExecutionStatus, SparkConf}
import org.apache.spark.status.api.v1
Expand Down Expand Up @@ -386,10 +387,9 @@ private[spark] class AppStatusStore(

def taskList(stageId: Int, stageAttemptId: Int, maxTasks: Int): Seq[v1.TaskData] = {
val stageKey = Array(stageId, stageAttemptId)
store.view(classOf[TaskDataWrapper]).index("stage").first(stageKey).last(stageKey).reverse()
.max(maxTasks).asScala.map { taskDataWrapper =>
constructTaskData(taskDataWrapper)
}.toSeq.reverse
val taskDataWrapperIter = store.view(classOf[TaskDataWrapper]).index("stage")
.first(stageKey).last(stageKey).reverse().max(maxTasks).asScala
constructTaskDataList(taskDataWrapperIter).reverse
}

def taskList(
Expand Down Expand Up @@ -428,9 +428,8 @@ private[spark] class AppStatusStore(
}

val ordered = if (ascending) indexed else indexed.reverse()
ordered.skip(offset).max(length).asScala.map { taskDataWrapper =>
constructTaskData(taskDataWrapper)
}.toSeq
val taskDataWrapperIter = ordered.skip(offset).max(length).asScala
constructTaskDataList(taskDataWrapperIter)
}

def executorSummary(stageId: Int, attemptId: Int): Map[String, v1.ExecutorStageSummary] = {
Expand Down Expand Up @@ -536,24 +535,29 @@ private[spark] class AppStatusStore(
store.close()
}

def constructTaskData(taskDataWrapper: TaskDataWrapper) : v1.TaskData = {
val taskDataOld: v1.TaskData = taskDataWrapper.toApi
val executorLogs: Option[Map[String, String]] = try {
Some(executorSummary(taskDataOld.executorId).executorLogs)
} catch {
case e: NoSuchElementException => e.getMessage
None
}
new v1.TaskData(taskDataOld.taskId, taskDataOld.index,
taskDataOld.attempt, taskDataOld.launchTime, taskDataOld.resultFetchStart,
taskDataOld.duration, taskDataOld.executorId, taskDataOld.host, taskDataOld.status,
taskDataOld.taskLocality, taskDataOld.speculative, taskDataOld.accumulatorUpdates,
taskDataOld.errorMessage, taskDataOld.taskMetrics,
executorLogs.getOrElse(Map[String, String]()),
AppStatusUtils.schedulerDelay(taskDataOld),
AppStatusUtils.gettingResultTime(taskDataOld))
def constructTaskDataList(taskDataWrapperIter: Iterable[TaskDataWrapper]): Seq[v1.TaskData] = {
val executorIdToLogs = new HashMap[String, Map[String, String]]()
taskDataWrapperIter.map { taskDataWrapper =>
val taskDataOld: v1.TaskData = taskDataWrapper.toApi
val executorLogs = executorIdToLogs.getOrElseUpdate(taskDataOld.executorId, {
try {
executorSummary(taskDataOld.executorId).executorLogs
} catch {
case e: NoSuchElementException =>
Map.empty
}
})

new v1.TaskData(taskDataOld.taskId, taskDataOld.index,
taskDataOld.attempt, taskDataOld.launchTime, taskDataOld.resultFetchStart,
taskDataOld.duration, taskDataOld.executorId, taskDataOld.host, taskDataOld.status,
taskDataOld.taskLocality, taskDataOld.speculative, taskDataOld.accumulatorUpdates,
taskDataOld.errorMessage, taskDataOld.taskMetrics,
executorLogs,
AppStatusUtils.schedulerDelay(taskDataOld),
AppStatusUtils.gettingResultTime(taskDataOld))
}.toSeq
}

}

private[spark] object AppStatusStore {
Expand Down