Shorten variable names

resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/InitContainerBootstrap.scala

@@ -32,25 +32,23 @@ private[spark] trait InitContainerBootstrap {
   /**
    * Bootstraps an init-container that downloads dependencies to be used by a main container.
    */
-  def bootstrapInitContainer(
-      originalPodWithInitContainer: PodWithDetachedInitContainer)
-  : PodWithDetachedInitContainer
+  def bootstrapInitContainer(original: PodWithDetachedInitContainer): PodWithDetachedInitContainer
 }
 
 private[spark] class InitContainerBootstrapImpl(
     initContainerImage: String,
-    dockerImagePullPolicy: String,
+    imagePullPolicy: String,
     jarsDownloadPath: String,
     filesDownloadPath: String,
     downloadTimeoutMinutes: Long,
-    initContainerConfigMapName: String,
-    initContainerConfigMapKey: String,
+    configMapName: String,
+    configMapKey: String,
     sparkRole: String,
     sparkConf: SparkConf)
   extends InitContainerBootstrap {
 
   override def bootstrapInitContainer(
-      podWithDetachedInitContainer: PodWithDetachedInitContainer): PodWithDetachedInitContainer = {
+      original: PodWithDetachedInitContainer): PodWithDetachedInitContainer = {
     val sharedVolumeMounts = Seq[VolumeMount](
       new VolumeMountBuilder()
         .withName(INIT_CONTAINER_DOWNLOAD_JARS_VOLUME_NAME)
@@ -61,25 +59,23 @@ private[spark] class InitContainerBootstrapImpl(
         .withMountPath(filesDownloadPath)
         .build())
 
-    val initContainerCustomEnvVarKeyPrefix = sparkRole match {
+    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 initContainerCustomEnvVars = sparkConf.getAllWithPrefix(initContainerCustomEnvVarKeyPrefix)
-      .toSeq
-      .map { env =>
-        new EnvVarBuilder()
-          .withName(env._1)
-          .withValue(env._2)
-          .build()
-      }
+    val customEnvVars = sparkConf.getAllWithPrefix(customEnvVarKeyPrefix).toSeq.map { env =>
+      new EnvVarBuilder()
+        .withName(env._1)
+        .withValue(env._2)
+        .build()
+    }
 
-    val initContainer = new ContainerBuilder(podWithDetachedInitContainer.initContainer)
+    val initContainer = new ContainerBuilder(original.initContainer)
       .withName("spark-init")
       .withImage(initContainerImage)
-      .withImagePullPolicy(dockerImagePullPolicy)
-      .addAllToEnv(initContainerCustomEnvVars.asJava)
+      .withImagePullPolicy(imagePullPolicy)
+      .addAllToEnv(customEnvVars.asJava)
       .addNewVolumeMount()
         .withName(INIT_CONTAINER_PROPERTIES_FILE_VOLUME)
         .withMountPath(INIT_CONTAINER_PROPERTIES_FILE_DIR)
@@ -88,14 +84,14 @@ private[spark] class InitContainerBootstrapImpl(
       .addToArgs(INIT_CONTAINER_PROPERTIES_FILE_PATH)
       .build()
 
-    val podWithBasicVolumes = new PodBuilder(podWithDetachedInitContainer.pod)
+    val podWithBasicVolumes = new PodBuilder(original.pod)
       .editSpec()
       .addNewVolume()
         .withName(INIT_CONTAINER_PROPERTIES_FILE_VOLUME)
         .withNewConfigMap()
-          .withName(initContainerConfigMapName)
+          .withName(configMapName)
           .addNewItem()
-            .withKey(initContainerConfigMapKey)
+            .withKey(configMapKey)
             .withPath(INIT_CONTAINER_PROPERTIES_FILE_NAME)
             .endItem()
           .endConfigMap()
@@ -111,8 +107,8 @@ private[spark] class InitContainerBootstrapImpl(
       .endSpec()
       .build()
 
-    val mainContainerWithMountedFiles = new ContainerBuilder(
-      podWithDetachedInitContainer.mainContainer)
+    val mainContainer = new ContainerBuilder(
+      original.mainContainer)
         .addToVolumeMounts(sharedVolumeMounts: _*)
         .addNewEnv()
           .withName(ENV_MOUNTED_FILES_DIR)
@@ -123,6 +119,6 @@ private[spark] class InitContainerBootstrapImpl(
     PodWithDetachedInitContainer(
       podWithBasicVolumes,
       initContainer,
-      mainContainerWithMountedFiles)
+      mainContainer)
   }
 }

resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/submit/DriverConfigOrchestrator.scala

@@ -41,7 +41,7 @@ private[spark] class DriverConfigOrchestrator(
     appName: String,
     mainClass: String,
     appArgs: Array[String],
-    submissionSparkConf: SparkConf) {
+    sparkConf: SparkConf) {
 
   // The resource name prefix is derived from the Spark application name, making it easy to connect
   // the names of the Kubernetes resources from e.g. kubectl or the Kubernetes dashboard to the
@@ -51,14 +51,14 @@ private[spark] class DriverConfigOrchestrator(
     s"$appName-$uuid".toLowerCase.replaceAll("\\.", "-")
   }
 
-  private val imagePullPolicy = submissionSparkConf.get(CONTAINER_IMAGE_PULL_POLICY)
+  private val imagePullPolicy = sparkConf.get(CONTAINER_IMAGE_PULL_POLICY)
   private val initContainerConfigMapName = s"$kubernetesResourceNamePrefix-init-config"
-  private val jarsDownloadPath = submissionSparkConf.get(JARS_DOWNLOAD_LOCATION)
-  private val filesDownloadPath = submissionSparkConf.get(FILES_DOWNLOAD_LOCATION)
+  private val jarsDownloadPath = sparkConf.get(JARS_DOWNLOAD_LOCATION)
+  private val filesDownloadPath = sparkConf.get(FILES_DOWNLOAD_LOCATION)
 
-  def getAllConfigurationSteps(): Seq[DriverConfigurationStep] = {
+  def getAllConfigurationSteps: Seq[DriverConfigurationStep] = {
     val driverCustomLabels = ConfigurationUtils.parsePrefixedKeyValuePairs(
-      submissionSparkConf,
+      sparkConf,
       KUBERNETES_DRIVER_LABEL_PREFIX)
     require(!driverCustomLabels.contains(SPARK_APP_ID_LABEL), "Label with key " +
       s"$SPARK_APP_ID_LABEL is not allowed as it is reserved for Spark bookkeeping " +
@@ -67,8 +67,8 @@ private[spark] class DriverConfigOrchestrator(
       s"$SPARK_ROLE_LABEL is not allowed as it is reserved for Spark bookkeeping " +
       "operations.")
 
-    val driverSecretNamesToMountPaths = ConfigurationUtils.parsePrefixedKeyValuePairs(
-      submissionSparkConf,
+    val secretNamesToMountPaths = ConfigurationUtils.parsePrefixedKeyValuePairs(
+      sparkConf,
       KUBERNETES_DRIVER_SECRETS_PREFIX)
 
     val allDriverLabels = driverCustomLabels ++ Map(
@@ -83,16 +83,16 @@ private[spark] class DriverConfigOrchestrator(
       appName,
       mainClass,
       appArgs,
-      submissionSparkConf)
+      sparkConf)
 
     val driverAddressStep = new DriverServiceBootstrapStep(
       kubernetesResourceNamePrefix,
       allDriverLabels,
-      submissionSparkConf,
+      sparkConf,
       new SystemClock)
 
     val kubernetesCredentialsStep = new DriverKubernetesCredentialsStep(
-      submissionSparkConf, kubernetesResourceNamePrefix)
+      sparkConf, kubernetesResourceNamePrefix)
 
     val additionalMainAppJar = if (mainAppResource.nonEmpty) {
        val mayBeResource = mainAppResource.get match {
@@ -105,11 +105,11 @@ private[spark] class DriverConfigOrchestrator(
       None
     }
 
-    val sparkJars = submissionSparkConf.getOption("spark.jars")
+    val sparkJars = sparkConf.getOption("spark.jars")
       .map(_.split(","))
       .getOrElse(Array.empty[String]) ++
       additionalMainAppJar.toSeq
-    val sparkFiles = submissionSparkConf.getOption("spark.files")
+    val sparkFiles = sparkConf.getOption("spark.files")
       .map(_.split(","))
       .getOrElse(Array.empty[String])
 
@@ -136,9 +136,9 @@ private[spark] class DriverConfigOrchestrator(
           allDriverLabels,
           initContainerConfigMapName,
           INIT_CONTAINER_PROPERTIES_FILE_NAME,
-          submissionSparkConf)
+          sparkConf)
         val bootstrapStep = new DriverInitContainerBootstrapStep(
-          orchestrator.getAllConfigurationSteps(),
+          orchestrator.getAllConfigurationSteps,
           initContainerConfigMapName,
           INIT_CONTAINER_PROPERTIES_FILE_NAME)
 
@@ -147,8 +147,8 @@ private[spark] class DriverConfigOrchestrator(
         None
       }
 
-    val mayBeMountSecretsStep = if (driverSecretNamesToMountPaths.nonEmpty) {
-      val mountSecretsBootstrap = new MountSecretsBootstrapImpl(driverSecretNamesToMountPaths)
+    val mayBeMountSecretsStep = if (secretNamesToMountPaths.nonEmpty) {
+      val mountSecretsBootstrap = new MountSecretsBootstrapImpl(secretNamesToMountPaths)
       Some(new DriverMountSecretsStep(mountSecretsBootstrap))
     } else {
       None

resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/submit/KubernetesClientApplication.scala

@@ -80,22 +80,22 @@ private[spark] object ClientArguments {
  * spark.kubernetes.submission.waitAppCompletion is true.
  *
  * @param submissionSteps steps that collectively configure the driver
- * @param submissionSparkConf the submission client Spark configuration
+ * @param sparkConf the submission client Spark configuration
  * @param kubernetesClient the client to talk to the Kubernetes API server
  * @param waitForAppCompletion a flag indicating whether the client should wait for the application
  *                             to complete
  * @param appName the application name
- * @param loggingPodStatusWatcher a watcher that monitors and logs the application status
+ * @param watcher a watcher that monitors and logs the application status
  */
 private[spark] class Client(
     submissionSteps: Seq[DriverConfigurationStep],
-    submissionSparkConf: SparkConf,
+    sparkConf: SparkConf,
     kubernetesClient: KubernetesClient,
     waitForAppCompletion: Boolean,
     appName: String,
-    loggingPodStatusWatcher: LoggingPodStatusWatcher) extends Logging {
+    watcher: LoggingPodStatusWatcher) extends Logging {
 
-  private val driverJavaOptions = submissionSparkConf.get(
+  private val driverJavaOptions = sparkConf.get(
     org.apache.spark.internal.config.DRIVER_JAVA_OPTIONS)
 
    /**
@@ -104,7 +104,7 @@ private[spark] class Client(
     * will be used to build the Driver Container, Driver Pod, and Kubernetes Resources
     */
   def run(): Unit = {
-    var currentDriverSpec = KubernetesDriverSpec.initialSpec(submissionSparkConf)
+    var currentDriverSpec = KubernetesDriverSpec.initialSpec(sparkConf)
     // submissionSteps contain steps necessary to take, to resolve varying
     // client arguments that are passed in, created by orchestrator
     for (nextStep <- submissionSteps) {
@@ -141,7 +141,7 @@ private[spark] class Client(
       kubernetesClient
         .pods()
         .withName(resolvedDriverPod.getMetadata.getName)
-        .watch(loggingPodStatusWatcher)) { _ =>
+        .watch(watcher)) { _ =>
       val createdDriverPod = kubernetesClient.pods().create(resolvedDriverPod)
       try {
         if (currentDriverSpec.otherKubernetesResources.nonEmpty) {
@@ -157,7 +157,7 @@ private[spark] class Client(
 
       if (waitForAppCompletion) {
         logInfo(s"Waiting for application $appName to finish...")
-        loggingPodStatusWatcher.awaitCompletion()
+        watcher.awaitCompletion()
         logInfo(s"Application $appName finished.")
       } else {
         logInfo(s"Deployed Spark application $appName into Kubernetes.")
@@ -207,10 +207,9 @@ private[spark] class KubernetesClientApplication extends SparkApplication {
     val master = sparkConf.get("spark.master").substring("k8s://".length)
     val loggingInterval = if (waitForAppCompletion) Some(sparkConf.get(REPORT_INTERVAL)) else None
 
-    val loggingPodStatusWatcher = new LoggingPodStatusWatcherImpl(
-      kubernetesAppId, loggingInterval)
+    val watcher = new LoggingPodStatusWatcherImpl(kubernetesAppId, loggingInterval)
 
-    val configurationStepsOrchestrator = new DriverConfigOrchestrator(
+    val orchestrator = new DriverConfigOrchestrator(
       namespace,
       kubernetesAppId,
       launchTime,
@@ -228,12 +227,12 @@ private[spark] class KubernetesClientApplication extends SparkApplication {
       None,
       None)) { kubernetesClient =>
         val client = new Client(
-          configurationStepsOrchestrator.getAllConfigurationSteps(),
+          orchestrator.getAllConfigurationSteps,
           sparkConf,
           kubernetesClient,
           waitForAppCompletion,
           appName,
-          loggingPodStatusWatcher)
+          watcher)
         client.run()
     }
   }