[SPARK-22757][Kubernetes] Enable use of remote dependencies (http, s3, gcs, etc.) in Kubernetes mode #19954
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| /* | ||
| * 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 | ||
|
|
||
| import scala.collection.JavaConverters._ | ||
|
|
||
| import io.fabric8.kubernetes.api.model.{ContainerBuilder, EmptyDirVolumeSource, EnvVarBuilder, PodBuilder, VolumeMount, VolumeMountBuilder} | ||
|
|
||
| import org.apache.spark.{SparkConf, SparkException} | ||
| import org.apache.spark.deploy.k8s.Config._ | ||
| import org.apache.spark.deploy.k8s.Constants._ | ||
|
|
||
| /** | ||
| * Bootstraps an init-container for downloading remote dependencies. This is separated out from | ||
| * the init-container steps API because this component can be used to bootstrap init-containers | ||
| * for both the driver and executors. | ||
| */ | ||
| private[spark] class InitContainerBootstrap( | ||
| initContainerImage: String, | ||
| imagePullPolicy: String, | ||
| jarsDownloadPath: String, | ||
| filesDownloadPath: String, | ||
| configMapName: String, | ||
| configMapKey: String, | ||
| sparkRole: String, | ||
| sparkConf: SparkConf) { | ||
|
|
||
| /** | ||
| * Bootstraps an init-container that downloads dependencies to be used by a main container. | ||
| */ | ||
| def bootstrapInitContainer( | ||
| original: PodWithDetachedInitContainer): PodWithDetachedInitContainer = { | ||
| val sharedVolumeMounts = Seq[VolumeMount]( | ||
| new VolumeMountBuilder() | ||
| .withName(INIT_CONTAINER_DOWNLOAD_JARS_VOLUME_NAME) | ||
| .withMountPath(jarsDownloadPath) | ||
| .build(), | ||
| new VolumeMountBuilder() | ||
| .withName(INIT_CONTAINER_DOWNLOAD_FILES_VOLUME_NAME) | ||
| .withMountPath(filesDownloadPath) | ||
| .build()) | ||
|
|
||
| val customEnvVarKeyPrefix = sparkRole match { | ||
| case SPARK_POD_DRIVER_ROLE => KUBERNETES_DRIVER_ENV_KEY | ||
| case SPARK_POD_EXECUTOR_ROLE => "spark.executorEnv." | ||
| case _ => throw new SparkException(s"$sparkRole is not a valid Spark pod role") | ||
| } | ||
| val customEnvVars = sparkConf.getAllWithPrefix(customEnvVarKeyPrefix).toSeq.map { | ||
| case (key, value) => | ||
| new EnvVarBuilder() | ||
| .withName(key) | ||
| .withValue(value) | ||
| .build() | ||
| } | ||
|
|
||
| val initContainer = new ContainerBuilder(original.initContainer) | ||
| .withName("spark-init") | ||
| .withImage(initContainerImage) | ||
| .withImagePullPolicy(imagePullPolicy) | ||
| .addAllToEnv(customEnvVars.asJava) | ||
| .addNewVolumeMount() | ||
| .withName(INIT_CONTAINER_PROPERTIES_FILE_VOLUME) | ||
| .withMountPath(INIT_CONTAINER_PROPERTIES_FILE_DIR) | ||
| .endVolumeMount() | ||
| .addToVolumeMounts(sharedVolumeMounts: _*) | ||
| .addToArgs(INIT_CONTAINER_PROPERTIES_FILE_PATH) | ||
| .build() | ||
|
|
||
| val podWithBasicVolumes = new PodBuilder(original.pod) | ||
| .editSpec() | ||
| .addNewVolume() | ||
| .withName(INIT_CONTAINER_PROPERTIES_FILE_VOLUME) | ||
| .withNewConfigMap() | ||
| .withName(configMapName) | ||
| .addNewItem() | ||
| .withKey(configMapKey) | ||
| .withPath(INIT_CONTAINER_PROPERTIES_FILE_NAME) | ||
| .endItem() | ||
| .endConfigMap() | ||
| .endVolume() | ||
| .addNewVolume() | ||
| .withName(INIT_CONTAINER_DOWNLOAD_JARS_VOLUME_NAME) | ||
| .withEmptyDir(new EmptyDirVolumeSource()) | ||
| .endVolume() | ||
| .addNewVolume() | ||
| .withName(INIT_CONTAINER_DOWNLOAD_FILES_VOLUME_NAME) | ||
| .withEmptyDir(new EmptyDirVolumeSource()) | ||
| .endVolume() | ||
| .endSpec() | ||
| .build() | ||
|
|
||
| val mainContainer = new ContainerBuilder(original.mainContainer) | ||
| .addToVolumeMounts(sharedVolumeMounts: _*) | ||
| .addNewEnv() | ||
| .withName(ENV_MOUNTED_FILES_DIR) | ||
| .withValue(filesDownloadPath) | ||
| .endEnv() | ||
| .build() | ||
|
|
||
| PodWithDetachedInitContainer( | ||
| podWithBasicVolumes, | ||
| initContainer, | ||
| mainContainer) | ||
| } | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| /* | ||
| * 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 | ||
|
|
||
| import io.fabric8.kubernetes.api.model.{Container, ContainerBuilder, Pod, PodBuilder} | ||
|
|
||
| /** | ||
| * Bootstraps a driver or executor container or an init-container with needed secrets mounted. | ||
| */ | ||
| private[spark] class MountSecretsBootstrap(secretNamesToMountPaths: Map[String, String]) { | ||
|
There was a problem hiding this comment. If I understand this class correctly, it seems like what you're trying to do here is to inject this logic into different steps that require this functionality. So the code that instantiates those steps needs to know about this dependency, and needs to know how to create both objects. Then the step implementation has to call this code. Instead, wouldn't it be cleaner to make the step inherit this functionality? e.g. The same comment could be made about the init container boostrap. But in both cases, I'm not sure this would work right now on the executor side, because as I mentioned it doesn't really use the same abstraction as the driver side. Which is kinda one of the problems with the current class hierarchy here... There was a problem hiding this comment. I created https://issues.apache.org/jira/browse/SPARK-22839 to keep track of the refactoring work. |
||
|
|
||
| /** | ||
| * Mounts Kubernetes secrets as secret volumes into the given container in the given pod. | ||
| * | ||
| * @param pod the pod into which the secret volumes are being added. | ||
| * @param container the container into which the secret volumes are being mounted. | ||
| * @return the updated pod and container with the secrets mounted. | ||
| */ | ||
| def mountSecrets(pod: Pod, container: Container): (Pod, Container) = { | ||
| var podBuilder = new PodBuilder(pod) | ||
| secretNamesToMountPaths.keys.foreach { name => | ||
| podBuilder = podBuilder | ||
| .editOrNewSpec() | ||
| .addNewVolume() | ||
| .withName(secretVolumeName(name)) | ||
| .withNewSecret() | ||
| .withSecretName(name) | ||
| .endSecret() | ||
| .endVolume() | ||
| .endSpec() | ||
| } | ||
|
|
||
| var containerBuilder = new ContainerBuilder(container) | ||
| secretNamesToMountPaths.foreach { case (name, path) => | ||
| containerBuilder = containerBuilder | ||
| .addNewVolumeMount() | ||
| .withName(secretVolumeName(name)) | ||
| .withMountPath(path) | ||
| .endVolumeMount() | ||
| } | ||
|
|
||
| (podBuilder.build(), containerBuilder.build()) | ||
| } | ||
|
|
||
| private def secretVolumeName(secretName: String): String = { | ||
| secretName + "-volume" | ||
| } | ||
| } | ||
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.
nit:
spark.kubernetes.initContainer.mountDependencies.timeout?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.
Please see the response regarding
spark.kubernetes.mountDependencies.maxSimultaneousDownloads.