switch to using jersey for metrics json

Author: squito

core/pom.xml

@@ -219,6 +219,11 @@
       <artifactId>jackson-module-scala_2.10</artifactId>
       <version>2.3.1</version>
     </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.media</groupId>
+      <artifactId>jersey-media-json-jackson</artifactId>
+      <version>2.15</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.mesos</groupId>
       <artifactId>mesos</artifactId>

core/src/main/java/org/apache/spark/JobExecutionStatus.java

@@ -17,9 +17,31 @@
 
 package org.apache.spark;
 
+import com.google.common.base.Joiner;
+
+import java.util.Arrays;
+
 public enum JobExecutionStatus {
   RUNNING,
   SUCCEEDED,
   FAILED,
-  UNKNOWN
+  UNKNOWN;
+
+
+  private static String VALID_VALUES = Joiner.on(", ").join(
+          Arrays.asList(JobExecutionStatus.values()));
+
+  public static JobExecutionStatus fromString(String str) {
+    if (str == null) {
+      return null;
+    }
+    try {
+      JobExecutionStatus res = valueOf(str.toUpperCase());
+      return res;
+    } catch (IllegalArgumentException iae) {
+      throw new IllegalArgumentException(
+              String.format("Illegal type='%s'. Supported type values: %s",
+                      str, VALID_VALUES));
+    }
+  }
 }

core/src/main/scala/org/apache/spark/deploy/history/OneApplicationJsonRoute.scala renamed to core/src/main/java/org/apache/spark/status/api/ApplicationStatus.java

@@ -14,21 +14,31 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.spark.deploy.history
 
-import javax.servlet.http.HttpServletRequest
+package org.apache.spark.status.api;
 
-import org.apache.spark.status.{UIRoot, JsonRequestHandler, StatusJsonRoute}
-import org.apache.spark.status.api.ApplicationInfo
+import com.google.common.base.Joiner;
 
-class OneApplicationJsonRoute(val uiRoot: UIRoot) extends StatusJsonRoute[ApplicationInfo] {
-  override def renderJson(request: HttpServletRequest): ApplicationInfo = {
-    val appIdOpt = JsonRequestHandler.extractAppId(request.getPathInfo)
-    appIdOpt.map{ appId =>
-      val apps = uiRoot.getApplicationInfoList.find{_.id == appId}
-      apps.getOrElse(throw new IllegalArgumentException("unknown app: " + appId))
-    }.getOrElse{
-      throw new IllegalArgumentException("no application id specified")
+import java.util.Arrays;
+
+public enum ApplicationStatus {
+    COMPLETED,
+    RUNNING;
+
+    private static String VALID_VALUES = Joiner.on(", ").join(
+            Arrays.asList(values()));
+
+    public static ApplicationStatus fromString(String str) {
+        if (str == null) {
+            return null;
+        }
+        for (ApplicationStatus status: values()) {
+            if (status.name().equalsIgnoreCase(str))
+                return status;
+        }
+        throw new IllegalArgumentException(
+                String.format("Illegal type='%s'. Supported type values: %s",
+                        str, VALID_VALUES));
     }
-  }
+
 }

core/src/main/java/org/apache/spark/status/api/StageStatus.java

@@ -1,4 +1,4 @@
-package org.apache.spark.status.api;/*
+/*
  * 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.
@@ -15,9 +15,31 @@
  * limitations under the License.
  */
 
+package org.apache.spark.status.api;
+
+import com.google.common.base.Joiner;
+
+import java.util.Arrays;
+
 public enum StageStatus {
     Active,
     Complete,
     Failed,
-    Pending
+    Pending;
+
+    private static String VALID_VALUES = Joiner.on(", ").join(
+            Arrays.asList(values()));
+
+    public static StageStatus fromString(String str) {
+        if (str == null) {
+            return null;
+        }
+        for (StageStatus status: values()) {
+            if (status.name().equalsIgnoreCase(str))
+                return status;
+        }
+        throw new IllegalArgumentException(
+                String.format("Illegal type='%s'. Supported type values: %s",
+                        str, VALID_VALUES));
+    }
 }

core/src/main/scala/org/apache/spark/deploy/history/HistoryServer.scala

@@ -21,9 +21,7 @@ import java.util.NoSuchElementException
 import javax.servlet.http.{HttpServlet, HttpServletRequest, HttpServletResponse}
 
 import com.google.common.cache._
-import org.apache.spark.deploy.master.ui.MasterApplicationJsonRoute
-import org.apache.spark.status.api.ApplicationInfo
-import org.apache.spark.status.{UIRoot, JsonRequestHandler}
+import org.apache.spark.status.api.v1.{ApplicationsListResource, ApplicationInfo, JsonRootResource, UIRoot}
 import org.eclipse.jetty.servlet.{ServletContextHandler, ServletHolder}
 
 import org.apache.spark.{Logging, SecurityManager, SparkConf}
@@ -117,9 +115,8 @@ class HistoryServer(
   def initialize() {
     attachPage(new HistoryPage(this))
 
-    val jsonHandler = new JsonRequestHandler(this, securityManager)
-    attachHandler(jsonHandler.jsonContextHandler)
 
+    attachHandler(JsonRootResource.getJsonServlet(this))
 
     attachHandler(createStaticHandler(SparkUI.STATIC_RESOURCE_DIR, "/static"))
 
@@ -161,7 +158,7 @@ class HistoryServer(
   def getApplicationList(refresh: Boolean) = provider.getListing(refresh)
 
   def getApplicationInfoList: Seq[ApplicationInfo] = {
-    getApplicationList(true).map{AllApplicationsJsonRoute.appHistoryInfoToPublicAppInfo}.toSeq
+    getApplicationList(true).map{ApplicationsListResource.appHistoryInfoToPublicAppInfo}.toSeq
   }
 
   /**

core/src/main/scala/org/apache/spark/deploy/master/ui/MasterApplicationJsonRoute.scala

@@ -18,10 +18,8 @@
 package org.apache.spark.deploy.master.ui
 
 import org.apache.spark.Logging
-import org.apache.spark.deploy.history.AllApplicationsJsonRoute
 import org.apache.spark.deploy.master.Master
-import org.apache.spark.status.{JsonRequestHandler, UIRoot}
-import org.apache.spark.status.api.ApplicationInfo
+import org.apache.spark.status.api.v1.{ApplicationsListResource, ApplicationInfo, JsonRootResource, UIRoot}
 import org.apache.spark.ui.{SparkUI, WebUI}
 import org.apache.spark.ui.JettyUtils._
 import org.apache.spark.util.AkkaUtils
@@ -47,8 +45,7 @@ class MasterWebUI(val master: Master, requestedPort: Int)
     attachPage(masterPage)
     attachHandler(createStaticHandler(MasterWebUI.STATIC_RESOURCE_DIR, "/static"))
 
-    val jsonHandler = new JsonRequestHandler(this, master.securityMgr)
-    attachHandler(jsonHandler.jsonContextHandler)
+    attachHandler(JsonRootResource.getJsonServlet(this))
   }
 
   /** Attach a reconstructed UI to this Master UI. Only valid after bind(). */
@@ -67,8 +64,8 @@ class MasterWebUI(val master: Master, requestedPort: Int)
     val state = masterPage.getMasterState
     val activeApps = state.activeApps.sortBy(_.startTime).reverse
     val completedApps = state.completedApps.sortBy(_.endTime).reverse
-    activeApps.map{AllApplicationsJsonRoute.convertApplicationInfo(_, false)} ++
-      completedApps.map{AllApplicationsJsonRoute.convertApplicationInfo(_, true)}
+    activeApps.map{ApplicationsListResource.convertApplicationInfo(_, false)} ++
+      completedApps.map{ApplicationsListResource.convertApplicationInfo(_, true)}
   }
 
   def getSparkUI(appId: String): Option[SparkUI] = {