Fixed continuity of executorToTasksActive, changed color of progress bars

This commit is contained in:
Karen Feng 2013-07-29 16:50:51 -07:00
parent c7b2788948
commit 87b821dc39
2 changed files with 6 additions and 3 deletions

View file

@ -93,7 +93,7 @@ private[spark] class ExecutorsUI(val sc: SparkContext) {
val memUsed = sc.getExecutorStorageStatus(a).memUsed().toString
val maxMem = sc.getExecutorStorageStatus(a).maxMem.toString
val diskUsed = sc.getExecutorStorageStatus(a).diskUsed().toString
val activeTasks = listener.executorToTasksActive.getOrElse(a.toString, Seq[Long]()).size.toString
val activeTasks = listener.executorToTasksActive.getOrElse(a.toString, HashSet[TaskInfo]()).size.toString
val failedTasks = listener.executorToTasksFailed.getOrElse(a.toString, 0).toString
val completedTasks = listener.executorToTasksComplete.getOrElse(a.toString, 0).toString
val totalTasks = listener.executorToTaskInfos(a.toString).size.toString

View file

@ -21,9 +21,11 @@ import java.util.Date
import javax.servlet.http.HttpServletRequest
import scala.collection.mutable.HashSet
import scala.Some
import scala.xml.{NodeSeq, Node}
import spark.scheduler.cluster.TaskInfo
import spark.scheduler.Stage
import spark.storage.StorageLevel
import spark.ui.Page._
@ -110,8 +112,8 @@ private[spark] class IndexPage(parent: JobProgressUI) {
val startWidth = "width: %s%%".format((started.toDouble/total)*100)
<div class="progress">
<div class="bar bar-success" style={completeWidth}></div>
<div class="bar bar-warning" style={startWidth}></div>
<div class="bar" style={completeWidth}></div>
<div class="bar bar-info" style={startWidth}></div>
</div>
}
@ -131,6 +133,7 @@ private[spark] class IndexPage(parent: JobProgressUI) {
case b => Utils.memoryBytesToString(b)
}
val startedTasks = listener.stageToTasksActive.getOrElse(s.id, HashSet[TaskInfo]()).size
val completedTasks = listener.stageToTasksComplete.getOrElse(s.id, 0)
val totalTasks = s.numPartitions