-
Notifications
You must be signed in to change notification settings - Fork 28.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[SPARK-24433][K8S] Initial R Bindings for SparkR on K8s
## What changes were proposed in this pull request?
Introducing R Bindings for Spark R on K8s
- [x] Running SparkR Job
## How was this patch tested?
This patch was tested with
- [x] Unit Tests
- [x] Integration Tests
## Example:
Commands to run example spark job:
1. `dev/make-distribution.sh --pip --r --tgz -Psparkr -Phadoop-2.7 -Pkubernetes`
2. `bin/docker-image-tool.sh -m -t testing build`
3.
```
bin/spark-submit \
--master k8s://https://192.168.64.33:8443 \
--deploy-mode cluster \
--name spark-r \
--conf spark.executor.instances=1 \
--conf spark.kubernetes.container.image=spark-r:testing \
local:///opt/spark/examples/src/main/r/dataframe.R
```
This above spark-submit command works given the distribution. (Will include this integration test in PR once PRB is ready).
Author: Ilan Filonenko <if56@cornell.edu>
Closes #21584 from ifilonenko/spark-r.- Loading branch information
1 parent
da2dc69
commit ba84bcb
Showing
17 changed files
with
344 additions
and
27 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
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
59 changes: 59 additions & 0 deletions
59
...ore/src/main/scala/org/apache/spark/deploy/k8s/features/bindings/RDriverFeatureStep.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,59 @@ | ||
| /* | ||
| * 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.k8s.features.bindings | ||
|
|
||
| import scala.collection.JavaConverters._ | ||
|
|
||
| import io.fabric8.kubernetes.api.model.{ContainerBuilder, EnvVarBuilder, HasMetadata} | ||
|
|
||
| import org.apache.spark.deploy.k8s.{KubernetesConf, KubernetesDriverSpecificConf, KubernetesUtils, SparkPod} | ||
| import org.apache.spark.deploy.k8s.Constants._ | ||
| import org.apache.spark.deploy.k8s.features.KubernetesFeatureConfigStep | ||
|
|
||
| private[spark] class RDriverFeatureStep( | ||
| kubernetesConf: KubernetesConf[KubernetesDriverSpecificConf]) | ||
| extends KubernetesFeatureConfigStep { | ||
| override def configurePod(pod: SparkPod): SparkPod = { | ||
| val roleConf = kubernetesConf.roleSpecificConf | ||
| require(roleConf.mainAppResource.isDefined, "R Main Resource must be defined") | ||
| val maybeRArgs = Option(roleConf.appArgs).filter(_.nonEmpty).map( | ||
| rArgs => | ||
| new EnvVarBuilder() | ||
| .withName(ENV_R_ARGS) | ||
| .withValue(rArgs.mkString(",")) | ||
| .build()) | ||
| val envSeq = | ||
| Seq(new EnvVarBuilder() | ||
| .withName(ENV_R_PRIMARY) | ||
| .withValue(KubernetesUtils.resolveFileUri(kubernetesConf.sparkRMainResource().get)) | ||
| .build()) | ||
| val rEnvs = envSeq ++ | ||
| maybeRArgs.toSeq | ||
|
|
||
| val withRPrimaryContainer = new ContainerBuilder(pod.container) | ||
| .addAllToEnv(rEnvs.asJava) | ||
| .addToArgs("driver-r") | ||
| .addToArgs("--properties-file", SPARK_CONF_PATH) | ||
| .addToArgs("--class", roleConf.mainClass) | ||
| .build() | ||
|
|
||
| SparkPod(pod.pod, withRPrimaryContainer) | ||
| } | ||
| override def getAdditionalPodSystemProperties(): Map[String, String] = Map.empty | ||
|
|
||
| override def getAdditionalKubernetesResources(): Seq[HasMetadata] = Seq.empty | ||
| } |
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
63 changes: 63 additions & 0 deletions
63
...rc/test/scala/org/apache/spark/deploy/k8s/features/bindings/RDriverFeatureStepSuite.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,63 @@ | ||
| /* | ||
| * 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.k8s.features.bindings | ||
|
|
||
| import scala.collection.JavaConverters._ | ||
|
|
||
| import org.apache.spark.{SparkConf, SparkFunSuite} | ||
| import org.apache.spark.deploy.k8s.{KubernetesConf, KubernetesDriverSpecificConf, SparkPod} | ||
| import org.apache.spark.deploy.k8s.Config._ | ||
| import org.apache.spark.deploy.k8s.Constants._ | ||
| import org.apache.spark.deploy.k8s.submit.RMainAppResource | ||
|
|
||
| class RDriverFeatureStepSuite extends SparkFunSuite { | ||
|
|
||
| test("R Step modifies container correctly") { | ||
| val expectedMainResource = "/main.R" | ||
| val mainResource = "local:///main.R" | ||
| val baseDriverPod = SparkPod.initialPod() | ||
| val sparkConf = new SparkConf(false) | ||
| .set(KUBERNETES_R_MAIN_APP_RESOURCE, mainResource) | ||
| val kubernetesConf = KubernetesConf( | ||
| sparkConf, | ||
| KubernetesDriverSpecificConf( | ||
| Some(RMainAppResource(mainResource)), | ||
| "test-app", | ||
| "r-runner", | ||
| Seq("5 7")), | ||
| appResourceNamePrefix = "", | ||
| appId = "", | ||
| roleLabels = Map.empty, | ||
| roleAnnotations = Map.empty, | ||
| roleSecretNamesToMountPaths = Map.empty, | ||
| roleSecretEnvNamesToKeyRefs = Map.empty, | ||
| roleEnvs = Map.empty, | ||
| roleVolumes = Seq.empty, | ||
| sparkFiles = Seq.empty[String]) | ||
|
|
||
| val step = new RDriverFeatureStep(kubernetesConf) | ||
| val driverContainerwithR = step.configurePod(baseDriverPod).container | ||
| assert(driverContainerwithR.getEnv.size === 2) | ||
| val envs = driverContainerwithR | ||
| .getEnv | ||
| .asScala | ||
| .map(env => (env.getName, env.getValue)) | ||
| .toMap | ||
| assert(envs(ENV_R_PRIMARY) === expectedMainResource) | ||
| assert(envs(ENV_R_ARGS) === "5 7") | ||
| } | ||
| } |
Oops, something went wrong.