Repository: spark Updated Branches: refs/heads/branch-2.0 0da8bce0e -> d65707b7f
http://git-wip-us.apache.org/repos/asf/spark/blob/d65707b7/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 6241593..1aa85d6 100644 --- a/core/src/main/scala/org/apache/spark/ui/UIUtils.scala +++ b/core/src/main/scala/org/apache/spark/ui/UIUtils.scala @@ -19,7 +19,7 @@ package org.apache.spark.ui import java.net.URLDecoder import java.text.SimpleDateFormat -import java.util.{Date, Locale} +import java.util.{Date, Locale, TimeZone} import scala.util.control.NonFatal import scala.xml._ @@ -502,4 +502,7 @@ private[spark] object UIUtils extends Logging { } param } + + def getTimeZoneOffset() : Int = + TimeZone.getDefault().getOffset(System.currentTimeMillis()) / 1000 / 60 } http://git-wip-us.apache.org/repos/asf/spark/blob/d65707b7/core/src/main/scala/org/apache/spark/ui/jobs/AllJobsPage.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/AllJobsPage.scala b/core/src/main/scala/org/apache/spark/ui/jobs/AllJobsPage.scala index 6f5a13b..373c26b 100644 --- a/core/src/main/scala/org/apache/spark/ui/jobs/AllJobsPage.scala +++ b/core/src/main/scala/org/apache/spark/ui/jobs/AllJobsPage.scala @@ -206,7 +206,7 @@ private[ui] class AllJobsPage(parent: JobsTab) extends WebUIPage("") { </div> ++ <script type="text/javascript"> {Unparsed(s"drawApplicationTimeline(${groupJsonArrayAsStr}," + - s"${eventArrayAsStr}, ${startTime});")} + s"${eventArrayAsStr}, ${startTime}, ${UIUtils.getTimeZoneOffset()});")} </script> } http://git-wip-us.apache.org/repos/asf/spark/blob/d65707b7/core/src/main/scala/org/apache/spark/ui/jobs/JobPage.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/JobPage.scala b/core/src/main/scala/org/apache/spark/ui/jobs/JobPage.scala index 22ee13b..99f2bd8 100644 --- a/core/src/main/scala/org/apache/spark/ui/jobs/JobPage.scala +++ b/core/src/main/scala/org/apache/spark/ui/jobs/JobPage.scala @@ -179,7 +179,8 @@ private[ui] class JobPage(parent: JobsTab) extends WebUIPage("job") { </div> </div> ++ <script type="text/javascript"> - {Unparsed(s"drawJobTimeline(${groupJsonArrayAsStr}, ${eventArrayAsStr}, ${appStartTime});")} + {Unparsed(s"drawJobTimeline(${groupJsonArrayAsStr}, ${eventArrayAsStr}, " + + s"${appStartTime}, ${UIUtils.getTimeZoneOffset()});")} </script> } http://git-wip-us.apache.org/repos/asf/spark/blob/d65707b7/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala b/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala index 5d1928a..6ddabfd 100644 --- a/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala +++ b/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala @@ -26,7 +26,7 @@ import scala.xml.{Elem, Node, Unparsed} import org.apache.commons.lang3.StringEscapeUtils -import org.apache.spark.{InternalAccumulator, SparkConf} +import org.apache.spark.SparkConf import org.apache.spark.executor.TaskMetrics import org.apache.spark.scheduler.{AccumulableInfo, TaskInfo, TaskLocality} import org.apache.spark.ui._ @@ -746,7 +746,8 @@ private[ui] class StagePage(parent: StagesTab) extends WebUIPage("stage") { </div> ++ <script type="text/javascript"> {Unparsed(s"drawTaskAssignmentTimeline(" + - s"$groupArrayStr, $executorsArrayStr, $minLaunchTime, $maxFinishTime)")} + s"$groupArrayStr, $executorsArrayStr, $minLaunchTime, $maxFinishTime, " + + s"${UIUtils.getTimeZoneOffset()})")} </script> } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
