forked from apache/spark
-
Notifications
You must be signed in to change notification settings - Fork 51
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #248 from palantir/resync-kube
Resync with apache-spark-on-k8s upstream
- Loading branch information
Showing
23 changed files
with
546 additions
and
155 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
52 changes: 52 additions & 0 deletions
52
...e/src/main/scala/org/apache/spark/deploy/kubernetes/submit/MountSmallFilesBootstrap.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,52 @@ | ||
| /* | ||
| * 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.submit | ||
|
|
||
| import io.fabric8.kubernetes.api.model.{Container, ContainerBuilder, Pod, PodBuilder} | ||
|
|
||
| import org.apache.spark.deploy.kubernetes.constants._ | ||
|
|
||
| private[spark] trait MountSmallFilesBootstrap { | ||
| def mountSmallFilesSecret(pod: Pod, container: Container): (Pod, Container) | ||
| } | ||
|
|
||
| private[spark] class MountSmallFilesBootstrapImpl( | ||
| secretName: String, secretMountPath: String) extends MountSmallFilesBootstrap { | ||
| def mountSmallFilesSecret(pod: Pod, container: Container): (Pod, Container) = { | ||
| val resolvedPod = new PodBuilder(pod) | ||
| .editOrNewSpec() | ||
| .addNewVolume() | ||
| .withName("submitted-files") | ||
| .withNewSecret() | ||
| .withSecretName(secretName) | ||
| .endSecret() | ||
| .endVolume() | ||
| .endSpec() | ||
| .build() | ||
| val resolvedContainer = new ContainerBuilder(container) | ||
| .addNewEnv() | ||
| .withName(ENV_MOUNTED_FILES_FROM_SECRET_DIR) | ||
| .withValue(secretMountPath) | ||
| .endEnv() | ||
| .addNewVolumeMount() | ||
| .withName("submitted-files") | ||
| .withMountPath(secretMountPath) | ||
| .endVolumeMount() | ||
| .build() | ||
| (resolvedPod, resolvedContainer) | ||
| } | ||
| } |
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
73 changes: 73 additions & 0 deletions
73
...cala/org/apache/spark/deploy/kubernetes/submit/submitsteps/MountSmallLocalFilesStep.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,73 @@ | ||
| /* | ||
| * 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.submit.submitsteps | ||
|
|
||
| import java.io.File | ||
|
|
||
| import com.google.common.io.{BaseEncoding, Files} | ||
| import io.fabric8.kubernetes.api.model.SecretBuilder | ||
| import scala.collection.JavaConverters._ | ||
|
|
||
| import org.apache.spark.deploy.kubernetes.config._ | ||
| import org.apache.spark.deploy.kubernetes.submit.{KubernetesFileUtils, MountSmallFilesBootstrap} | ||
| import org.apache.spark.util.Utils | ||
|
|
||
| private[spark] class MountSmallLocalFilesStep( | ||
| sparkFiles: Seq[String], | ||
| smallFilesSecretName: String, | ||
| smallFilesSecretMountPath: String, | ||
| mountSmallFilesBootstrap: MountSmallFilesBootstrap) extends DriverConfigurationStep { | ||
|
|
||
| import MountSmallLocalFilesStep._ | ||
| override def configureDriver(driverSpec: KubernetesDriverSpec): KubernetesDriverSpec = { | ||
| val localFiles = KubernetesFileUtils.getOnlySubmitterLocalFiles(sparkFiles).map(new File(_)) | ||
| val totalSizeBytes = localFiles.map(_.length()).sum | ||
| val totalSizeBytesString = Utils.bytesToString(totalSizeBytes) | ||
| require(totalSizeBytes < MAX_SECRET_BUNDLE_SIZE_BYTES, | ||
| s"Total size of all files submitted must be less than $MAX_SECRET_BUNDLE_SIZE_BYTES_STRING" + | ||
| s" if you do not use a resource staging server. The total size of all submitted local" + | ||
| s" files is $totalSizeBytesString. Please install a resource staging server and configure" + | ||
| s" your application to use it via ${RESOURCE_STAGING_SERVER_URI.key}") | ||
| val localFileBase64Contents = localFiles.map { file => | ||
| val fileBase64 = BaseEncoding.base64().encode(Files.toByteArray(file)) | ||
| (file.getName, fileBase64) | ||
| }.toMap | ||
| val localFilesSecret = new SecretBuilder() | ||
| .withNewMetadata() | ||
| .withName(smallFilesSecretName) | ||
| .endMetadata() | ||
| .withData(localFileBase64Contents.asJava) | ||
| .build() | ||
| val (resolvedDriverPod, resolvedDriverContainer) = | ||
| mountSmallFilesBootstrap.mountSmallFilesSecret( | ||
| driverSpec.driverPod, driverSpec.driverContainer) | ||
| val resolvedSparkConf = driverSpec.driverSparkConf.clone() | ||
| .set(EXECUTOR_SUBMITTED_SMALL_FILES_SECRET, smallFilesSecretName) | ||
| .set(EXECUTOR_SUBMITTED_SMALL_FILES_SECRET_MOUNT_PATH, smallFilesSecretMountPath) | ||
| driverSpec.copy( | ||
| driverPod = resolvedDriverPod, | ||
| driverContainer = resolvedDriverContainer, | ||
| driverSparkConf = resolvedSparkConf, | ||
| otherKubernetesResources = driverSpec.otherKubernetesResources ++ Seq(localFilesSecret)) | ||
| } | ||
| } | ||
|
|
||
| private[spark] object MountSmallLocalFilesStep { | ||
| val MAX_SECRET_BUNDLE_SIZE_BYTES = 10240 | ||
| val MAX_SECRET_BUNDLE_SIZE_BYTES_STRING = | ||
| Utils.bytesToString(MAX_SECRET_BUNDLE_SIZE_BYTES) | ||
| } |
Oops, something went wrong.