dongjoon-hyun commented on a change in pull request #27735: URL: https://github.com/apache/spark/pull/27735#discussion_r523276926
########## File path: resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/submit/KubernetesClientUtils.scala ########## @@ -0,0 +1,128 @@ +/* + * 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.submit + +import java.io.{File, StringWriter} +import java.util.Properties + +import scala.collection.JavaConverters._ +import scala.io.{Codec, Source} + +import io.fabric8.kubernetes.api.model.{ConfigMap, ConfigMapBuilder, KeyToPath} + +import org.apache.spark.SparkConf +import org.apache.spark.deploy.k8s.{Constants, KubernetesUtils} +import org.apache.spark.deploy.k8s.Constants.ENV_SPARK_CONF_DIR +import org.apache.spark.internal.Logging + +private[spark] object KubernetesClientUtils extends Logging { + + // Config map name can be 63 chars at max. + def configMapName(prefix: String): String = s"${prefix.take(54)}-conf-map" + + val configMapNameExecutor: String = configMapName(s"spark-exec-${KubernetesUtils.uniqueID()}") + + val configMapNameDriver: String = configMapName(s"spark-drv-${KubernetesUtils.uniqueID()}") + + private def buildStringFromPropertiesMap(configMapName: String, + propertiesMap: Map[String, String]): String = { + val properties = new Properties() + propertiesMap.foreach { case (k, v) => + properties.setProperty(k, v) + } + val propertiesWriter = new StringWriter() + properties.store(propertiesWriter, + s"Java properties built from Kubernetes config map with name: $configMapName") + propertiesWriter.toString + } + + /** + * Build, file -> 'file's content' map of all the selected files in SPARK_CONF_DIR. + */ + def buildSparkConfDirFilesMap(configMapName: String, + sparkConf: SparkConf, resolvedPropertiesMap: Map[String, String]): Map[String, String] = { + val loadedConfFilesMap = KubernetesClientUtils.loadSparkConfDirFiles(sparkConf) + // Add resolved spark conf to the loaded configuration files map. + if (resolvedPropertiesMap.nonEmpty) { + val resolvedProperties: String = KubernetesClientUtils + .buildStringFromPropertiesMap(configMapName, resolvedPropertiesMap) + loadedConfFilesMap ++ Map(Constants.SPARK_CONF_FILE_NAME -> resolvedProperties) + } else { + loadedConfFilesMap + } + } + + def buildKeyToPathObjects(confFilesMap: Map[String, String]): Seq[KeyToPath] = { + confFilesMap.map { + case (fileName: String, _: String) => + val filePermissionMode = 420 // 420 is decimal for octal literal 0644. + new KeyToPath(fileName, filePermissionMode, fileName) + }.toList.sortBy(x => x.getKey) // List is sorted to make mocking based tests work + } + + /** + * Build a Config Map that will hold the content for environment variable SPARK_CONF_DIR + * on remote pods. + */ + def buildConfigMap(configMapName: String, confFileMap: Map[String, String], + withLabels: Map[String, String] = Map()): ConfigMap = { + new ConfigMapBuilder() + .withNewMetadata() + .withName(configMapName) + .withLabels(withLabels.asJava) + .endMetadata() + .addToData(confFileMap.asJava) + .build() + } + + private def loadSparkConfDirFiles(conf: SparkConf): Map[String, String] = { + val confDir = Option(conf.getenv(ENV_SPARK_CONF_DIR)).orElse( + conf.getOption("spark.home").map(dir => s"$dir/conf")) + if (confDir.isDefined) { + val confFiles = listConfFiles(confDir.get) + logInfo(s"Spark configuration files loaded from $confDir : ${confFiles.mkString(",")}") + confFiles.map { file => + val source = Source.fromFile(file)(Codec.UTF8) + val mapping = (file.getName -> source.mkString) + source.close() + mapping + }.toMap + } else { + logInfo(s"Spark configuration directory is not detected, please set env:$ENV_SPARK_CONF_DIR") Review comment: For the existing users, I guess we don't need to give this additional direction because they don't need this. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
