forked from apache/incubator-livy
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add servlet to handle livy client sessions.
This is not complete; it allows creating / tearing down sessions and submitting synchronous / asynchronous jobs, but there's currently no way to retrieve a job's results (or even monitoring it's state, since the backend code for that is not implemented). Also includes a new base test class for the servlets that does away with a lot of copy & paste.
- Loading branch information
1 parent
d298921
commit 35c9541
Showing
11 changed files
with
416 additions
and
117 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
91 changes: 91 additions & 0 deletions
91
server/src/main/scala/com/cloudera/livy/server/client/ClientSessionServlet.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| /* | ||
| * 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 com.cloudera.livy.server.client | ||
|
|
||
| import java.io.{ByteArrayInputStream, ObjectInputStream} | ||
|
|
||
| import org.json4s.JValue | ||
| import org.json4s.jackson.JsonMethods._ | ||
| import org.json4s.jackson.Serialization.write | ||
| import org.scalatra._ | ||
|
|
||
| import com.cloudera.livy.Job | ||
| import com.cloudera.livy.server.SessionServlet | ||
| import com.cloudera.livy.sessions.{SessionManager, SessionState} | ||
| import com.cloudera.livy.spark.client._ | ||
|
|
||
| class ClientSessionServlet(sessionManager: SessionManager[ClientSession]) | ||
| extends SessionServlet[ClientSession](sessionManager) { | ||
|
|
||
| post("/:id/submit-job") { | ||
| sessionManager.get(params("id").toInt) match { | ||
| case Some(session) => | ||
| val req = parsedBody.extract[SerializedJob] | ||
| if (req.job != null && req.job.length > 0) { | ||
| Created(session.submitJob(req.job)) | ||
| } else { | ||
| BadRequest("No job provided.") | ||
| } | ||
| case None => | ||
| } | ||
| } | ||
|
|
||
| post("/:id/run-job") { | ||
| sessionManager.get(params("id").toInt) match { | ||
| case Some(session) => | ||
| val req = parsedBody.extract[SerializedJob] | ||
| if (req.job != null && req.job.length > 0) { | ||
| val jobId = session.runJob(req.job) | ||
| Created(JobSubmitted(jobId)) | ||
| } else { | ||
| BadRequest("No job provided.") | ||
| } | ||
| case None => | ||
| } | ||
| } | ||
|
|
||
| post("/:id/add-jar") { | ||
| sessionManager.get(params("id").toInt) match { | ||
| case Some(session) => | ||
| session.addJar(parsedBody.extract[AddJar].uri) | ||
| case None => | ||
| } | ||
| } | ||
|
|
||
| post("/:id/add-file") { | ||
| sessionManager.get(params("id").toInt) match { | ||
| case Some(session) => | ||
| session.addFile(parsedBody.extract[AddFile].uri) | ||
| case None => | ||
| } | ||
| } | ||
|
|
||
| post("/:id/job-status") { | ||
| sessionManager.get(params("id").toInt) match { | ||
| case Some(session) => | ||
| case None => | ||
| } | ||
| } | ||
|
|
||
| override protected def serializeSession(session: ClientSession): JValue = { | ||
| val view = ClientSessionView(session.id, session.state) | ||
| parse(write(view)) | ||
| } | ||
|
|
||
| case class ClientSessionView(id: Int, state: SessionState) | ||
|
|
||
| } |
77 changes: 77 additions & 0 deletions
77
server/src/test/scala/com/cloudera/livy/server/BaseSessionServletSpec.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| /* | ||
| * Licensed to Cloudera, Inc. under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. Cloudera, Inc. 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 com.cloudera.livy.server | ||
|
|
||
| import org.json4s.{DefaultFormats, Formats, JValue} | ||
| import org.json4s.jackson.JsonMethods._ | ||
| import org.json4s.jackson.Serialization.write | ||
| import org.scalatest.{BeforeAndAfterAll, FunSpecLike} | ||
| import org.scalatra.test.scalatest.ScalatraSuite | ||
|
|
||
| import com.cloudera.livy.LivyConf | ||
| import com.cloudera.livy.sessions.{Session, SessionFactory, SessionManager} | ||
|
|
||
| abstract class BaseSessionServletSpec[S <: Session] extends ScalatraSuite | ||
| with FunSpecLike with BeforeAndAfterAll { | ||
|
|
||
| protected implicit def jsonFormats: Formats = DefaultFormats | ||
|
|
||
| override protected def withFixture(test: NoArgTest) = { | ||
| assume(sys.env.get("SPARK_HOME").isDefined, "SPARK_HOME is not set.") | ||
| test() | ||
| } | ||
|
|
||
| override def afterAll(): Unit = { | ||
| super.afterAll() | ||
| sessionManager.shutdown() | ||
| } | ||
|
|
||
|
|
||
| def sessionFactory: SessionFactory[S] | ||
| def servlet: SessionServlet[S] | ||
|
|
||
| val livyConf = new LivyConf() | ||
| val sessionManager = new SessionManager(livyConf, sessionFactory) | ||
|
|
||
| addServlet(servlet, "/*") | ||
|
|
||
| protected def toJson(msg: AnyRef): String = write(msg) | ||
|
|
||
| protected def headers: Map[String, String] = Map("Content-Type" -> "application/json") | ||
|
|
||
| protected def getJson(uri: String, expectedStatus: Int = 200)(fn: (JValue) => Unit): Unit = { | ||
| get(uri)(doTest(expectedStatus, fn)) | ||
| } | ||
|
|
||
| protected def postJson(uri: String, body: AnyRef, expectedStatus: Int = 201) | ||
| (fn: (JValue) => Unit): Unit = { | ||
| post(uri, body = toJson(body), headers = headers)(doTest(expectedStatus, fn)) | ||
| } | ||
|
|
||
| protected def deleteJson(uri: String, expectedStatus: Int = 200)(fn: (JValue) => Unit): Unit = { | ||
| delete(uri)(doTest(expectedStatus, fn)) | ||
| } | ||
|
|
||
| private def doTest(expectedStatus: Int, fn: (JValue) => Unit): Unit = { | ||
| status should be (expectedStatus) | ||
| header("Content-Type") should include("application/json") | ||
| fn(parse(body)) | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.