do not raise twice on template parse failuer

Author: onursatici

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

@@ -96,7 +96,7 @@ private[spark] object KubernetesUtils extends Logging {
       case e: Exception =>
         logError(
           s"Encountered exception while attempting to load initial pod spec from file", e)
-        throw new SparkException("Could not load driver pod from template file.", e)
+        throw new SparkException("Could not load pod from template file.", e)
     }
   }
 

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

@@ -24,7 +24,6 @@ import org.apache.spark.{SparkConf, SparkException}
 import org.apache.spark.deploy.k8s._
 import org.apache.spark.deploy.k8s.features._
 import org.apache.spark.deploy.k8s.features.bindings.{JavaDriverFeatureStep, PythonDriverFeatureStep}
-import org.apache.spark.internal.Logging
 import org.apache.spark.util.Utils
 
 private[spark] class KubernetesDriverBuilder(
@@ -126,24 +125,17 @@ private[spark] class KubernetesDriverBuilder(
   }
 }
 
-private[spark] object KubernetesDriverBuilder extends Logging {
+private[spark] object KubernetesDriverBuilder {
   val MAX_SECRET_BUNDLE_SIZE_BYTES = 20480
   val MAX_SECRET_BUNDLE_SIZE_BYTES_STRING =
     Utils.bytesToString(MAX_SECRET_BUNDLE_SIZE_BYTES)
 
   def apply(kubernetesClient: KubernetesClient, conf: SparkConf): KubernetesDriverBuilder = {
     conf.get(Config.KUBERNETES_DRIVER_PODTEMPLATE_FILE)
       .map(new File(_))
-      .map(file => new KubernetesDriverBuilder(provideInitialPod = () => {
-        try {
-          KubernetesUtils.loadPodFromTemplate(kubernetesClient, file)
-        } catch {
-          case e: Exception =>
-            logError(
-              s"Encountered exception while attempting to load initial pod spec from file", e)
-            throw new SparkException("Could not load driver pod from template file.", e)
-        }
-      }))
+      .map(file => new KubernetesDriverBuilder(provideInitialPod = () =>
+        KubernetesUtils.loadPodFromTemplate(kubernetesClient, file)
+      ))
       .getOrElse(new KubernetesDriverBuilder())
   }
 }

resource-managers/kubernetes/core/src/main/scala/org/apache/spark/scheduler/cluster/k8s/KubernetesExecutorBuilder.scala

@@ -20,11 +20,10 @@ import java.io.File
 
 import io.fabric8.kubernetes.client.KubernetesClient
 
-import org.apache.spark.{SparkConf, SparkException}
+import org.apache.spark.SparkConf
 import org.apache.spark.deploy.k8s._
 import org.apache.spark.deploy.k8s.features._
 import org.apache.spark.deploy.k8s.features.{BasicExecutorFeatureStep, EnvSecretsFeatureStep, LocalDirsFeatureStep, MountSecretsFeatureStep}
-import org.apache.spark.internal.Logging
 
 private[spark] class KubernetesExecutorBuilder(
     provideBasicStep: (KubernetesConf [KubernetesExecutorSpecificConf])
@@ -75,20 +74,13 @@ private[spark] class KubernetesExecutorBuilder(
   }
 }
 
-private[spark] object KubernetesExecutorBuilder extends Logging {
+private[spark] object KubernetesExecutorBuilder {
   def apply(kubernetesClient: KubernetesClient, conf: SparkConf): KubernetesExecutorBuilder = {
     conf.get(Config.KUBERNETES_EXECUTOR_PODTEMPLATE_FILE)
       .map(new File(_))
-      .map(file => new KubernetesExecutorBuilder(provideInitialPod = () => {
-        try {
+      .map(file => new KubernetesExecutorBuilder(provideInitialPod = () =>
           KubernetesUtils.loadPodFromTemplate(kubernetesClient, file)
-        } catch {
-          case e: Exception =>
-            logError(
-              s"Encountered exception while attempting to load initial pod spec from file", e)
-            throw new SparkException("Could not load executor pod from template file.", e)
-        }
-      }))
+      ))
       .getOrElse(new KubernetesExecutorBuilder())
   }
 }

resource-managers/kubernetes/core/src/test/scala/org/apache/spark/deploy/k8s/submit/KubernetesDriverBuilderSuite.scala

@@ -351,7 +351,7 @@ class KubernetesDriverBuilderSuite extends SparkFunSuite {
           .endMetadata()
           .build())
     }
-    assert(exception.getMessage.contains("Could not load driver pod from template file."))
+    assert(exception.getMessage.contains("Could not load pod from template file."))
   }
 
   private def constructSpecWithPodTemplate(pod: Pod) : KubernetesDriverSpec = {