add appSparkVersion for Rest API to be consistent

apache · Apr 26, 2017 · 5f6e80b · 5f6e80b
1 parent bad5ea2
commit 5f6e80b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/core/src/main/scala/org/apache/spark/status/api/v1/ApplicationListResource.scala b/core/src/main/scala/org/apache/spark/status/api/v1/ApplicationListResource.scala
@@ -92,7 +92,8 @@ private[spark] object ApplicationsListResource {
           sparkUser = internalAttemptInfo.sparkUser,
           completed = internalAttemptInfo.completed
         )
-      }
+      },
+      appSparkVersion = org.apache.spark.SPARK_VERSION
     )
   }
 }
diff --git a/core/src/main/scala/org/apache/spark/status/api/v1/api.scala b/core/src/main/scala/org/apache/spark/status/api/v1/api.scala
@@ -29,7 +29,8 @@ class ApplicationInfo private[spark](
     val maxCores: Option[Int],
     val coresPerExecutor: Option[Int],
     val memoryPerExecutorMB: Option[Int],
-    val attempts: Seq[ApplicationAttemptInfo])
+    val attempts: Seq[ApplicationAttemptInfo],
+    val appSparkVersion: String)
 
 class ApplicationAttemptInfo private[spark](
     val attemptId: Option[String],

diff --git a/core/src/main/scala/org/apache/spark/ui/SparkUI.scala b/core/src/main/scala/org/apache/spark/ui/SparkUI.scala
@@ -120,7 +120,8 @@ private[spark] class SparkUI private (
         lastUpdated = new Date(startTime),
         sparkUser = "",
         completed = false
-      ))
+      )),
+      appSparkVersion = appSparkVersion
     ))
   }
 

diff --git a/core/src/test/scala/org/apache/spark/deploy/history/ApplicationCacheSuite.scala b/core/src/test/scala/org/apache/spark/deploy/history/ApplicationCacheSuite.scala
@@ -177,7 +177,7 @@ class ApplicationCacheSuite extends SparkFunSuite with Logging with MockitoSugar
       ended: Long): SparkUI = {
     val info = new ApplicationInfo(name, name, Some(1), Some(1), Some(1), Some(64),
       Seq(new AttemptInfo(attemptId, new Date(started), new Date(ended),
-        new Date(ended), ended - started, "user", completed)))
+        new Date(ended), ended - started, "user", completed)), org.apache.spark.SPARK_VERSION)
     val ui = mock[SparkUI]
     when(ui.getApplicationInfoList).thenReturn(List(info).iterator)
     when(ui.getAppName).thenReturn(name)