forked from apache/spark
-
Notifications
You must be signed in to change notification settings - Fork 2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add/modify/delete ThirdPartyResources. #8
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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
163 changes: 163 additions & 0 deletions
163
...agers/kubernetes/src/main/scala/org/apache/spark/deploy/kubernetes/SparkJobResource.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,163 @@ | ||
| /* | ||
| * 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.deploy.kubernetes | ||
|
|
||
| import io.fabric8.kubernetes.client.{BaseClient, KubernetesClient} | ||
| import okhttp3.{MediaType, OkHttpClient, Request, RequestBody} | ||
| import org.json4s.{CustomSerializer, DefaultFormats, JString} | ||
| import org.json4s.JsonAST.JNull | ||
| import org.json4s.JsonDSL._ | ||
| import org.json4s.jackson.JsonMethods._ | ||
| import org.json4s.jackson.Serialization.{read, write} | ||
|
|
||
| import org.apache.spark.SparkException | ||
| import org.apache.spark.internal.Logging | ||
| import org.apache.spark.scheduler.cluster.kubernetes.JobState | ||
| import org.apache.spark.scheduler.cluster.kubernetes.JobState._ | ||
|
|
||
| /* | ||
| * Representation of a Spark Job State in Kubernetes | ||
| * */ | ||
| object SparkJobResource { | ||
| case class Metadata(name: String, | ||
| uid: Option[String] = None, | ||
| labels: Option[Map[String, String]] = None, | ||
| annotations: Option[Map[String, String]] = None) | ||
|
|
||
| case class SparkJobState(apiVersion: String, | ||
| kind: String, | ||
| metadata: Metadata, | ||
| spec: Map[String, Any]) | ||
|
|
||
| case object JobStateSerDe | ||
| extends CustomSerializer[JobState](format => | ||
| ({ | ||
| case JString("SUBMITTED") => JobState.SUBMITTED | ||
| case JString("QUEUED") => JobState.QUEUED | ||
| case JString("RUNNING") => JobState.RUNNING | ||
| case JString("FINISHED") => JobState.FINISHED | ||
| case JString("KILLED") => JobState.KILLED | ||
| case JString("FAILED") => JobState.FAILED | ||
| case JNull => | ||
| throw new UnsupportedOperationException("No JobState Specified") | ||
| }, { | ||
| case JobState.FAILED => JString("FAILED") | ||
| case JobState.SUBMITTED => JString("SUBMITTED") | ||
| case JobState.KILLED => JString("KILLED") | ||
| case JobState.FINISHED => JString("FINISHED") | ||
| case JobState.QUEUED => JString("QUEUED") | ||
| case JobState.RUNNING => JString("RUNNING") | ||
| })) | ||
| } | ||
|
|
||
| class SparkJobResource(client: KubernetesClient) extends Logging { | ||
|
|
||
| import SparkJobResource._ | ||
|
|
||
| implicit val formats = DefaultFormats + JobStateSerDe | ||
| private val httpClient = getHttpClient(client.asInstanceOf[BaseClient]) | ||
| private val kind = "SparkJob" | ||
| private val apiVersion = "apache.io/v1" | ||
| private val apiEndpoint = s"${client.getMasterUrl}apis/$apiVersion/" + | ||
| s"namespaces/${client.getNamespace}/sparkjobs" | ||
|
|
||
| private def getHttpClient(client: BaseClient): OkHttpClient = { | ||
| val field = classOf[BaseClient].getDeclaredField("httpClient") | ||
| try { | ||
| field.setAccessible(true) | ||
| field.get(client).asInstanceOf[OkHttpClient] | ||
| } finally { | ||
| field.setAccessible(false) | ||
| } | ||
| } | ||
|
|
||
| /* | ||
| * using a Map as an argument here allows adding more info into the Object if needed | ||
| * */ | ||
| def createJobObject(name: String, keyValuePairs: Map[String, Any]): Unit = { | ||
| val resourceObject = | ||
| SparkJobState(apiVersion, kind, Metadata(name), keyValuePairs) | ||
| val payload = parse(write(resourceObject)) | ||
| val requestBody = RequestBody | ||
| .create(MediaType.parse("application/json"), compact(render(payload))) | ||
| val request = | ||
| new Request.Builder().post(requestBody).url(apiEndpoint).build() | ||
|
|
||
| val response = httpClient.newCall(request).execute() | ||
| if (response.code() == 201) { | ||
| logInfo( | ||
| s"Successfully posted resource $name: " + | ||
| s"${pretty(render(parse(write(resourceObject))))}") | ||
| } else { | ||
| val msg = | ||
| s"Failed to post resource $name. ${response.toString}. ${compact(render(payload))}" | ||
| logError(msg) | ||
| throw new SparkException(msg) | ||
| } | ||
| } | ||
|
|
||
| def updateJobObject(name: String, value: String, fieldPath: String): Unit = { | ||
| val payload = List( | ||
| ("op" -> "replace") ~ ("path" -> fieldPath) ~ ("value" -> value)) | ||
| val requestBody = RequestBody.create( | ||
| MediaType.parse("application/json-patch+json"), | ||
| compact(render(payload))) | ||
| val request = new Request.Builder() | ||
| .post(requestBody) | ||
| .url(s"$apiEndpoint/$name") | ||
| .build() | ||
| val response = httpClient.newCall(request).execute() | ||
| if (response.code() == 200) { | ||
| logInfo(s"Successfully patched resource $name") | ||
| } else { | ||
| val msg = | ||
| s"Failed to patch resource $name. ${response.message()}. ${compact(render(payload))}" | ||
| logError(msg) | ||
| throw new SparkException(msg) | ||
| } | ||
| } | ||
|
|
||
| def deleteJobObject(name: String): Unit = { | ||
| val request = | ||
| new Request.Builder().delete().url(s"$apiEndpoint/$name").build() | ||
| val response = httpClient.newCall(request).execute() | ||
| if (response.code() == 200) { | ||
| logInfo(s"Successfully deleted resource $name") | ||
| } else { | ||
| val msg = | ||
| s"Failed to delete resource $name. ${response.message()}. ${request}" | ||
| logError(msg) | ||
| throw new SparkException(msg) | ||
| } | ||
| } | ||
|
|
||
| def getJobObject(name: String): SparkJobState = { | ||
| val request = | ||
| new Request.Builder().get().url(s"$apiEndpoint/$name").build() | ||
| val response = httpClient.newCall(request).execute() | ||
| if (response.code() == 200) { | ||
| logInfo(s"Successfully retrieved resource $name") | ||
| read[SparkJobState](response.body().string()) | ||
| } else { | ||
| val msg = s"Failed to retrieve resource $name. ${response.message()}" | ||
| logError(msg) | ||
| throw new SparkException(msg) | ||
| } | ||
| } | ||
|
|
||
| } |
33 changes: 33 additions & 0 deletions
33
...rs/kubernetes/src/main/scala/org/apache/spark/scheduler/cluster/kubernetes/JobState.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,33 @@ | ||
| /* | ||
| * 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.scheduler.cluster.kubernetes | ||
|
|
||
| private[spark] object JobState extends Enumeration { | ||
| type JobState = Value | ||
|
|
||
| /* | ||
| * QUEUED - Spark Job has been queued to run | ||
| * SUBMITTED - Driver Pod deployed but tasks are not yet scheduled on worker pod(s) | ||
| * RUNNING - Task(s) have been allocated to worker pod(s) to run and Spark Job is now running | ||
| * FINISHED - Spark Job ran and exited cleanly, i.e, worker pod(s) and driver pod were | ||
| * gracefully deleted | ||
| * FAILED - Spark Job Failed due to error | ||
| * KILLED - A user manually killed this Spark Job | ||
| */ | ||
| val QUEUED, SUBMITTED, RUNNING, FINISHED, FAILED, KILLED = Value | ||
| } |
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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This reverts a previous change made on k8s-support.