You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by va...@apache.org on 2017/02/23 04:03:07 UTC
spark git commit: [SPARK-16122][CORE] Add rest api for job environment
Repository: spark
Updated Branches:
refs/heads/master d3147502e -> 66c4b79af
[SPARK-16122][CORE] Add rest api for job environment
## What changes were proposed in this pull request?
add rest api for job environment.
## How was this patch tested?
existing ut.
Author: uncleGen <hu...@gmail.com>
Closes #16949 from uncleGen/SPARK-16122.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/66c4b79a
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/66c4b79a
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/66c4b79a
Branch: refs/heads/master
Commit: 66c4b79afd3aad4c1f9446b641e28d5513cbdf5f
Parents: d314750
Author: uncleGen <hu...@gmail.com>
Authored: Wed Feb 22 20:03:01 2017 -0800
Committer: Marcelo Vanzin <va...@cloudera.com>
Committed: Wed Feb 22 20:03:01 2017 -0800
----------------------------------------------------------------------
.../spark/status/api/v1/ApiRootResource.scala | 15 +++++++
.../api/v1/ApplicationEnvironmentResource.scala | 45 ++++++++++++++++++++
.../org/apache/spark/status/api/v1/api.scala | 11 +++++
3 files changed, 71 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/66c4b79a/core/src/main/scala/org/apache/spark/status/api/v1/ApiRootResource.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/status/api/v1/ApiRootResource.scala b/core/src/main/scala/org/apache/spark/status/api/v1/ApiRootResource.scala
index 67ccf43..00f918c 100644
--- a/core/src/main/scala/org/apache/spark/status/api/v1/ApiRootResource.scala
+++ b/core/src/main/scala/org/apache/spark/status/api/v1/ApiRootResource.scala
@@ -199,6 +199,21 @@ private[v1] class ApiRootResource extends ApiRequestContext {
new VersionResource(uiRoot)
}
+ @Path("applications/{appId}/environment")
+ def getEnvironment(@PathParam("appId") appId: String): ApplicationEnvironmentResource = {
+ withSparkUI(appId, None) { ui =>
+ new ApplicationEnvironmentResource(ui)
+ }
+ }
+
+ @Path("applications/{appId}/{attemptId}/environment")
+ def getEnvironment(
+ @PathParam("appId") appId: String,
+ @PathParam("attemptId") attemptId: String): ApplicationEnvironmentResource = {
+ withSparkUI(appId, Some(attemptId)) { ui =>
+ new ApplicationEnvironmentResource(ui)
+ }
+ }
}
private[spark] object ApiRootResource {
http://git-wip-us.apache.org/repos/asf/spark/blob/66c4b79a/core/src/main/scala/org/apache/spark/status/api/v1/ApplicationEnvironmentResource.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/status/api/v1/ApplicationEnvironmentResource.scala b/core/src/main/scala/org/apache/spark/status/api/v1/ApplicationEnvironmentResource.scala
new file mode 100644
index 0000000..739a8ac
--- /dev/null
+++ b/core/src/main/scala/org/apache/spark/status/api/v1/ApplicationEnvironmentResource.scala
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.spark.status.api.v1
+
+import javax.ws.rs._
+import javax.ws.rs.core.MediaType
+
+import org.apache.spark.ui.SparkUI
+
+@Produces(Array(MediaType.APPLICATION_JSON))
+private[v1] class ApplicationEnvironmentResource(ui: SparkUI) {
+
+ @GET
+ def getEnvironmentInfo(): ApplicationEnvironmentInfo = {
+ val listener = ui.environmentListener
+ listener.synchronized {
+ val jvmInfo = Map(listener.jvmInformation: _*)
+ val runtime = new RuntimeInfo(
+ jvmInfo("Java Version"),
+ jvmInfo("Java Home"),
+ jvmInfo("Scala Version"))
+
+ new ApplicationEnvironmentInfo(
+ runtime,
+ listener.sparkProperties,
+ listener.systemProperties,
+ listener.classpathEntries)
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/spark/blob/66c4b79a/core/src/main/scala/org/apache/spark/status/api/v1/api.scala
----------------------------------------------------------------------
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
index c509398..5b92273 100644
--- 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
@@ -252,3 +252,14 @@ class AccumulableInfo private[spark](
class VersionInfo private[spark](
val spark: String)
+
+class ApplicationEnvironmentInfo private[spark] (
+ val runtime: RuntimeInfo,
+ val sparkProperties: Seq[(String, String)],
+ val systemProperties: Seq[(String, String)],
+ val classpathEntries: Seq[(String, String)])
+
+class RuntimeInfo private[spark](
+ val javaVersion: String,
+ val javaHome: String,
+ val scalaVersion: String)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org