From 67a27e54073c8df05ed06c1a8df07211bc31e223 Mon Sep 17 00:00:00 2001 From: uncleGen Date: Tue, 23 Dec 2014 10:55:03 +0800 Subject: [PATCH 1/2] [SPARK-4920][UI]: back port the PR-3763 to branch 1.1 --- .../org/apache/spark/ui/static/webui.css | 10 ++++++++++ .../scala/org/apache/spark/SparkContext.scala | 4 +--- .../main/scala/org/apache/spark/package.scala | 1 + .../scheduler/EventLoggingListener.scala | 4 ++-- .../scala/org/apache/spark/ui/UIUtils.scala | 20 +++++++------------ .../scheduler/EventLoggingListenerSuite.scala | 6 +++--- 6 files changed, 24 insertions(+), 21 deletions(-) diff --git a/core/src/main/resources/org/apache/spark/ui/static/webui.css b/core/src/main/resources/org/apache/spark/ui/static/webui.css index 152bde5f6994f..acba9ce35b2f0 100644 --- a/core/src/main/resources/org/apache/spark/ui/static/webui.css +++ b/core/src/main/resources/org/apache/spark/ui/static/webui.css @@ -120,6 +120,16 @@ pre { border: none; } +.version { + line-height: 30px; + vertical-align: bottom; + font-size: 12px; + padding: 0; + margin: 0; + font-weight: bold; + color: #777; +} + .tooltip { font-weight: normal; } diff --git a/core/src/main/scala/org/apache/spark/SparkContext.scala b/core/src/main/scala/org/apache/spark/SparkContext.scala index e1e7e83570c4b..0d68a2fad5dce 100644 --- a/core/src/main/scala/org/apache/spark/SparkContext.scala +++ b/core/src/main/scala/org/apache/spark/SparkContext.scala @@ -853,7 +853,7 @@ class SparkContext(config: SparkConf) extends Logging { } /** The version of Spark on which this application is running. */ - def version = SparkContext.SPARK_VERSION + def version = SPARK_VERSION /** * Return a map from the slave to the max memory available for caching and the remaining @@ -1334,8 +1334,6 @@ class SparkContext(config: SparkConf) extends Logging { */ object SparkContext extends Logging { - private[spark] val SPARK_VERSION = "1.1.2-SNAPSHOT" - private[spark] val SPARK_JOB_DESCRIPTION = "spark.job.description" private[spark] val SPARK_JOB_GROUP_ID = "spark.jobGroup.id" diff --git a/core/src/main/scala/org/apache/spark/package.scala b/core/src/main/scala/org/apache/spark/package.scala index 5cdbc306e56a0..8caff7eb05762 100644 --- a/core/src/main/scala/org/apache/spark/package.scala +++ b/core/src/main/scala/org/apache/spark/package.scala @@ -44,4 +44,5 @@ package org.apache package object spark { // For package docs only + val SPARK_VERSION = "1.1.2-SNAPSHOT" } diff --git a/core/src/main/scala/org/apache/spark/scheduler/EventLoggingListener.scala b/core/src/main/scala/org/apache/spark/scheduler/EventLoggingListener.scala index 370fcd85aa680..730ec7e24753f 100644 --- a/core/src/main/scala/org/apache/spark/scheduler/EventLoggingListener.scala +++ b/core/src/main/scala/org/apache/spark/scheduler/EventLoggingListener.scala @@ -26,7 +26,7 @@ import org.apache.hadoop.fs.permission.FsPermission import org.json4s.JsonAST.JValue import org.json4s.jackson.JsonMethods._ -import org.apache.spark.{Logging, SparkConf, SparkContext} +import org.apache.spark.{Logging, SparkConf, SPARK_VERSION} import org.apache.spark.deploy.SparkHadoopUtil import org.apache.spark.io.CompressionCodec import org.apache.spark.util.{FileLogger, JsonProtocol, Utils} @@ -83,7 +83,7 @@ private[spark] class EventLoggingListener( sparkConf.get("spark.io.compression.codec", CompressionCodec.DEFAULT_COMPRESSION_CODEC) logger.newFile(COMPRESSION_CODEC_PREFIX + codec) } - logger.newFile(SPARK_VERSION_PREFIX + SparkContext.SPARK_VERSION) + logger.newFile(SPARK_VERSION_PREFIX + SPARK_VERSION) logger.newFile(LOG_PREFIX + logger.fileIndex) } 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 8c437ce8f67f5..999368715eee4 100644 --- a/core/src/main/scala/org/apache/spark/ui/UIUtils.scala +++ b/core/src/main/scala/org/apache/spark/ui/UIUtils.scala @@ -186,9 +186,12 @@ private[spark] object UIUtils extends Logging {
- - - +
+ + + {org.apache.spark.SPARK_VERSION} + +
    {header}

{shortAppName} application UI @@ -205,11 +208,6 @@ private[spark] object UIUtils extends Logging {

{content}
- } @@ -229,6 +227,7 @@ private[spark] object UIUtils extends Logging { + {org.apache.spark.SPARK_VERSION} {title} @@ -236,11 +235,6 @@ private[spark] object UIUtils extends Logging { {content} - } diff --git a/core/src/test/scala/org/apache/spark/scheduler/EventLoggingListenerSuite.scala b/core/src/test/scala/org/apache/spark/scheduler/EventLoggingListenerSuite.scala index 10d8b299317ea..bfd72749a9f1c 100644 --- a/core/src/test/scala/org/apache/spark/scheduler/EventLoggingListenerSuite.scala +++ b/core/src/test/scala/org/apache/spark/scheduler/EventLoggingListenerSuite.scala @@ -25,7 +25,7 @@ import org.apache.hadoop.fs.{FileStatus, Path} import org.json4s.jackson.JsonMethods._ import org.scalatest.{BeforeAndAfter, FunSuite} -import org.apache.spark.{SparkConf, SparkContext} +import org.apache.spark.{SparkConf, SparkContext, SPARK_VERSION} import org.apache.spark.io.CompressionCodec import org.apache.spark.util.{JsonProtocol, Utils} @@ -194,7 +194,7 @@ class EventLoggingListenerSuite extends FunSuite with BeforeAndAfter { def assertInfoCorrect(info: EventLoggingInfo, loggerStopped: Boolean) { assert(info.logPaths.size > 0) - assert(info.sparkVersion === SparkContext.SPARK_VERSION) + assert(info.sparkVersion === SPARK_VERSION) assert(info.compressionCodec.isDefined === compressionCodec.isDefined) info.compressionCodec.foreach { codec => assert(compressionCodec.isDefined) @@ -378,7 +378,7 @@ class EventLoggingListenerSuite extends FunSuite with BeforeAndAfter { private def assertSparkVersionIsValid(logFiles: Array[FileStatus]) { val file = logFiles.map(_.getPath.getName).find(EventLoggingListener.isSparkVersionFile) assert(file.isDefined) - assert(EventLoggingListener.parseSparkVersion(file.get) === SparkContext.SPARK_VERSION) + assert(EventLoggingListener.parseSparkVersion(file.get) === SPARK_VERSION) } private def assertCompressionCodecIsValid(logFiles: Array[FileStatus], compressionCodec: String) { From ec2365fafa159bd4cc1d3a62a125ac76d4e0dd16 Mon Sep 17 00:00:00 2001 From: uncleGen Date: Tue, 23 Dec 2014 13:07:51 +0800 Subject: [PATCH 2/2] error fix --- core/src/main/scala/org/apache/spark/ui/UIUtils.scala | 7 ++++--- .../sql/hive/thriftserver/HiveThriftServer2Suite.scala | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) 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 999368715eee4..0e285ddf763b5 100644 --- a/core/src/main/scala/org/apache/spark/ui/UIUtils.scala +++ b/core/src/main/scala/org/apache/spark/ui/UIUtils.scala @@ -23,7 +23,7 @@ import java.util.{Locale, Date} import scala.xml.Node import org.apache.spark.Logging -import org.apache.spark.SparkContext +import org.apache.spark.SPARK_VERSION /** Utility functions for generating XML pages with spark content. */ private[spark] object UIUtils extends Logging { @@ -189,7 +189,7 @@ private[spark] object UIUtils extends Logging {
- {org.apache.spark.SPARK_VERSION} + {SPARK_VERSION}
@@ -227,7 +227,8 @@ private[spark] object UIUtils extends Logging { - {org.apache.spark.SPARK_VERSION} + {SPARK_VERSION} {title} diff --git a/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2Suite.scala b/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2Suite.scala index 08b4cc1c42c31..bdea44bf2b636 100644 --- a/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2Suite.scala +++ b/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2Suite.scala @@ -37,7 +37,7 @@ import org.apache.thrift.protocol.TBinaryProtocol import org.apache.thrift.transport.TSocket import org.scalatest.FunSuite -import org.apache.spark.{SparkContext, Logging} +import org.apache.spark.{SparkContext, Logging, SPARK_VERSION} import org.apache.spark.sql.catalyst.util.getTempFilePath /** @@ -227,7 +227,7 @@ class HiveThriftServer2Suite extends FunSuite with Logging { client.getInfo(sessionHandle, GetInfoType.CLI_SERVER_NAME).getStringValue } - assertResult(SparkContext.SPARK_VERSION, "Spark version shouldn't be \"Unknown\"") { + assertResult(SPARK_VERSION, "Spark version shouldn't be \"Unknown\"") { client.getInfo(sessionHandle, GetInfoType.CLI_DBMS_VER).getStringValue } }